From d622748202c160b193018e1c22fca348eccfa716 Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Fri, 22 Sep 2023 16:23:38 +1000 Subject: [PATCH 1/4] Disable tasks on self hosted runners --- .github/workflows/release.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 62eadd0451a..de56463c986 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,6 +14,8 @@ env: DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} REPO_NAME: ${{ github.repository_owner }}/lighthouse IMAGE_NAME: ${{ github.repository_owner }}/lighthouse + # Enable self-hosted runners for the sigp repo only. + SELF_HOSTED_RUNNERS: ${{ github.repository == 'sigp/lighthouse' }} jobs: extract-version: @@ -68,6 +70,7 @@ jobs: - name: Checkout sources uses: actions/checkout@v3 - name: Get latest version of stable Rust + if: env.SELF_HOSTED_RUNNERS == false run: rustup update stable # ============================== @@ -75,7 +78,7 @@ jobs: # ============================== - uses: KyleMayes/install-llvm-action@v1 - if: startsWith(matrix.arch, 'x86_64-windows') + if: env.SELF_HOSTED_RUNNERS == false && startsWith(matrix.arch, 'x86_64-windows') with: version: "15.0" directory: ${{ runner.temp }}/llvm From 8d22015327bde9df2857a685098e14ad264bc77e Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Fri, 22 Sep 2023 16:31:00 +1000 Subject: [PATCH 2/4] Hack for testing --- .github/workflows/release.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index de56463c986..d03163c74e9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,6 +2,8 @@ name: Release Suite on: push: + branches: + - fix-release-ci tags: - v* @@ -22,7 +24,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Extract version - run: echo "VERSION=$(echo ${GITHUB_REF#refs/tags/})" >> $GITHUB_OUTPUT + # run: echo "VERSION=$(echo ${GITHUB_REF#refs/tags/})" >> $GITHUB_OUTPUT + # TODO(paul): remove the line below and uncomment the line above. + run: echo "VERSION=test_only" >> $GITHUB_OUTPUT id: extract_version outputs: VERSION: ${{ steps.extract_version.outputs.VERSION }} From 5522754d48759e910756e61210e96c948057d20f Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Fri, 22 Sep 2023 19:37:28 +1000 Subject: [PATCH 3/4] Revert "Hack for testing" This reverts commit 8d22015327bde9df2857a685098e14ad264bc77e. --- .github/workflows/release.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d03163c74e9..de56463c986 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,8 +2,6 @@ name: Release Suite on: push: - branches: - - fix-release-ci tags: - v* @@ -24,9 +22,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Extract version - # run: echo "VERSION=$(echo ${GITHUB_REF#refs/tags/})" >> $GITHUB_OUTPUT - # TODO(paul): remove the line below and uncomment the line above. - run: echo "VERSION=test_only" >> $GITHUB_OUTPUT + run: echo "VERSION=$(echo ${GITHUB_REF#refs/tags/})" >> $GITHUB_OUTPUT id: extract_version outputs: VERSION: ${{ steps.extract_version.outputs.VERSION }} From 115df0d775c43cbae36eec19a3e5fedef2b96c3d Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Fri, 22 Sep 2023 19:50:05 +1000 Subject: [PATCH 4/4] Add quotes for equality checks --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index de56463c986..24ca09ec00e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -70,7 +70,7 @@ jobs: - name: Checkout sources uses: actions/checkout@v3 - name: Get latest version of stable Rust - if: env.SELF_HOSTED_RUNNERS == false + if: env.SELF_HOSTED_RUNNERS == 'false' run: rustup update stable # ============================== @@ -78,7 +78,7 @@ jobs: # ============================== - uses: KyleMayes/install-llvm-action@v1 - if: env.SELF_HOSTED_RUNNERS == false && startsWith(matrix.arch, 'x86_64-windows') + if: env.SELF_HOSTED_RUNNERS == 'false' && startsWith(matrix.arch, 'x86_64-windows') with: version: "15.0" directory: ${{ runner.temp }}/llvm