uncomment jobs, disable script debugging

EngFlow · Oct 18, 2024 · 4ad6b06 · 4ad6b06
1 parent 96f9ff4
commit 4ad6b06
Showing 1 changed file with 66 additions and 69 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -39,9 +39,6 @@ env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   RELEASE_VERSION: ${{ inputs.version }}
 
-  # DO NOT SUBMIT
-  SCRIPT_DEBUG: "on"
-
 jobs:
   check-version:
     runs-on:
@@ -58,47 +55,47 @@ jobs:
       - uses: actions/checkout@v4
       - run: infra/release-check.sh
 
-  # build-linux-artifacts:
-  #   # Linux is separate because we execute with CI runners, which don't support
-  #   # macOS or Windows yet. We use a Debian 11 image because binaries built on
-  #   # newer versions are incompatible with older version due to the libc runtime
-  #   # dependency.
-  #   runs-on:
-  #     - self-hosted
-  #     - os=linux
-  #     - arch=x64
-  #     - "engflow-container-image=docker://645088952840.dkr.ecr.eu-west-1.amazonaws.com/engflow-ci/debian12-dind-x64@sha256:763903935682de148b4e09fe1d7ef3bbc4ec829d59c3f41cb9519984639eaa06"
-  #     - "engflow-pool=ci_sysbox_x64"
-  #     - "engflow-runtime=sysbox-runc"
-  #     - "engflow-runner-id=${{ github.repository_id }}_build-linux-artifacts_${{ github.run_id }}_${{ github.run_number }}_${{ github.run_attempt }}"
-  #   timeout-minutes: 10
-  #   needs:
-  #     - check-version
-
-  #   env:
-  #     ARCH: "x64"
-  #     OS: "linux"
-
-  #   steps:
-  #     - uses: actions/checkout@v4
-
-  #     - name: Log in
-  #       run: infra/login.sh
-
-  #     - name: Build release artifacts
-  #       if: success()
-  #       run: infra/release-build.sh
-
-  #     - uses: actions/upload-artifact@v4
-  #       if: success()
-  #       with:
-  #         path: _out
-  #         if-no-files-found: error
-  #         retention-days: 1
-  #         overwrite: true
-
-  #     - name: Log out
-  #       run: infra/logout.sh
+  build-linux-artifacts:
+    # Linux is separate because we execute with CI runners, which don't support
+    # macOS or Windows yet. We use a Debian 11 image because binaries built on
+    # newer versions are incompatible with older version due to the libc runtime
+    # dependency.
+    runs-on:
+      - self-hosted
+      - os=linux
+      - arch=x64
+      - "engflow-container-image=docker://645088952840.dkr.ecr.eu-west-1.amazonaws.com/engflow-ci/debian12-dind-x64@sha256:763903935682de148b4e09fe1d7ef3bbc4ec829d59c3f41cb9519984639eaa06"
+      - "engflow-pool=ci_sysbox_x64"
+      - "engflow-runtime=sysbox-runc"
+      - "engflow-runner-id=${{ github.repository_id }}_build-linux-artifacts_${{ github.run_id }}_${{ github.run_number }}_${{ github.run_attempt }}"
+    timeout-minutes: 10
+    needs:
+      - check-version
+
+    env:
+      ARCH: "x64"
+      OS: "linux"
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Log in
+        run: infra/login.sh
+
+      - name: Build release artifacts
+        if: success()
+        run: infra/release-build.sh
+
+      - uses: actions/upload-artifact@v4
+        if: success()
+        with:
+          path: _out
+          if-no-files-found: error
+          retention-days: 1
+          overwrite: true
+
+      - name: Log out
+        run: infra/logout.sh
 
   build-other-artifacts:
     runs-on:
@@ -121,10 +118,10 @@ jobs:
             os_distribution: "monterey"
             os_version: "12"
 
-          # - os: "windows"
-          #   arch: "x64"
-          #   os_distribution: "server"
-          #   os_version: "2022"
+          - os: "windows"
+            arch: "x64"
+            os_distribution: "server"
+            os_version: "2022"
 
     env:
       ARCH: ${{ matrix.arch }}
@@ -154,24 +151,24 @@ jobs:
         run: infra/logout.sh
         shell: bash
 
-  # create-release:
-  #   runs-on:
-  #     - self-hosted
-  #     - os=linux
-  #     - arch=x64
-  #     - "engflow-container-image=docker://645088952840.dkr.ecr.eu-west-1.amazonaws.com/engflow-ci/debian12-dind-x64@sha256:763903935682de148b4e09fe1d7ef3bbc4ec829d59c3f41cb9519984639eaa06"
-  #     - "engflow-pool=ci_sysbox_x64"
-  #     - "engflow-runtime=sysbox-runc"
-  #     - "engflow-runner-id=${{ github.repository_id }}_create-release_${{ github.run_id }}_${{ github.run_number }}_${{ github.run_attempt }}"
-  #   timeout-minutes: 10
-  #   needs:
-  #     - build-other-artifacts
-  #     - build-linux-artifacts
-
-  #   steps:
-  #     - uses: actions/checkout@v4
-  #     - uses: actions/download-artifact@v4
-  #       with:
-  #         path: _out
-  #         merge-multiple: true
-  #     - run: infra/release-create.sh
+  create-release:
+    runs-on:
+      - self-hosted
+      - os=linux
+      - arch=x64
+      - "engflow-container-image=docker://645088952840.dkr.ecr.eu-west-1.amazonaws.com/engflow-ci/debian12-dind-x64@sha256:763903935682de148b4e09fe1d7ef3bbc4ec829d59c3f41cb9519984639eaa06"
+      - "engflow-pool=ci_sysbox_x64"
+      - "engflow-runtime=sysbox-runc"
+      - "engflow-runner-id=${{ github.repository_id }}_create-release_${{ github.run_id }}_${{ github.run_number }}_${{ github.run_attempt }}"
+    timeout-minutes: 10
+    needs:
+      - build-other-artifacts
+      - build-linux-artifacts
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
+        with:
+          path: _out
+          merge-multiple: true
+      - run: infra/release-create.sh