restore

Author: joshuarli

.github/workflows/bootstrap.yml

@@ -18,32 +18,29 @@ env:
   DEBUG: "1"
 
 jobs:
-  # bootstrap:
-  #   runs-on: ubuntu-22.04
-  #   timeout-minutes: 60
-  #   env:
-  #     DEVENV_FETCH_BRANCH: master
-  #     SNTY_DEVENV_BRANCH:
-  #       "${{ github.event.pull_request && github.head_ref || github.ref_name }}"
-  #   steps:
-  #     - uses: actions/checkout@v4
-  #     - name: install
-  #       run: |
-  #         set -u
-  #         : should be able to be run from anywhere:
-  #         repo=$PWD
-  #         mv install-devenv.sh /tmp
-  #         cd /tmp
-  #         ./install-devenv.sh  < $repo/ci/install-devenv-checks.sh
-  #     - name: bootstrap sentry
-  #       run: ./ci/devenv-bootstrap.sh
+  bootstrap:
+    runs-on: ubuntu-22.04
+    timeout-minutes: 30
+    env:
+      DEVENV_FETCH_BRANCH: master
+      SNTY_DEVENV_BRANCH:
+        "${{ github.event.pull_request && github.head_ref || github.ref_name }}"
+    steps:
+      - uses: actions/checkout@v4
+      - name: install
+        run: |
+          set -u
+          : should be able to be run from anywhere:
+          repo=$PWD
+          mv install-devenv.sh /tmp
+          cd /tmp
+          ./install-devenv.sh  < $repo/ci/install-devenv-checks.sh
+      - name: bootstrap sentry
+        run: ./ci/devenv-bootstrap.sh
 
   bootstrap-macos:
-    # This job takes half an hour and costs a lot of money.
-    # Let's just run on main commits.
-    #if: ${{ github.ref == 'refs/heads/main' }}
     runs-on: macos-15
-    timeout-minutes: 60
+    timeout-minutes: 30
     env:
       DEVENV_FETCH_BRANCH: master
       SNTY_DEVENV_BRANCH: