From 5bff72ba889e7630cc7ce6d574e179432f6a1d69 Mon Sep 17 00:00:00 2001 From: Paul Taylor <178183+trxcllnt@users.noreply.github.com> Date: Thu, 1 Feb 2024 21:34:27 -0800 Subject: [PATCH 1/6] Fix buildx setup on github runners --- .github/actions/setup-runner-env/action.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/actions/setup-runner-env/action.yml b/.github/actions/setup-runner-env/action.yml index b52487360..cc495881b 100644 --- a/.github/actions/setup-runner-env/action.yml +++ b/.github/actions/setup-runner-env/action.yml @@ -33,7 +33,15 @@ runs: shell: bash run: docker context create builder - - name: Setup docker buildx + - if: env.RUNNER_ENVIRONMENT == 'github-hosted' + name: Setup docker buildx on github-hosted runners + uses: docker/setup-buildx-action@v2 + with: + buildkitd-flags: --debug + endpoint: builder + + - if: env.RUNNER_ENVIRONMENT != 'github-hosted' + name: Setup docker buildx on self-hosted runners uses: docker/setup-buildx-action@v2 with: buildkitd-flags: --debug --config /etc/buildkit/buildkitd.toml From b6465456ff13476680617bcaf0688bd0d3266096 Mon Sep 17 00:00:00 2001 From: Paul Taylor <178183+trxcllnt@users.noreply.github.com> Date: Thu, 1 Feb 2024 21:40:35 -0800 Subject: [PATCH 2/6] run CI if any relevant actions change --- .github/actions/feature-matrix/action.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/actions/feature-matrix/action.yml b/.github/actions/feature-matrix/action.yml index f59855064..0e7d250c6 100644 --- a/.github/actions/feature-matrix/action.yml +++ b/.github/actions/feature-matrix/action.yml @@ -30,11 +30,18 @@ runs: files: | features/src/** features/test/** + .github/actions/build-and-test-feature/* + .github/actions/free-disk-space/* + .github/actions/build-linux-image/* + .github/actions/image-matrix/* + .github/actions/copy-common-scripts/* + .github/actions/get-pr-info/* + .github/actions/install-devcontainers-cli/* + .github/actions/devcontainer-json/* + .github/actions/setup-runner-env/* + .github/actions/feature-matrix/* .github/workflows/test.yml - .github/actions/feature-matrix/action.sh - .github/actions/feature-matrix/action.yml .github/workflows/build-and-test-feature.yml - .github/actions/build-and-test-feature/action.yml - name: Report changes if: inputs.full_matrix != 'true' From f186c94c6b4af3a1add9e849b2a2aa892ba773aa Mon Sep 17 00:00:00 2001 From: Paul Taylor <178183+trxcllnt@users.noreply.github.com> Date: Thu, 1 Feb 2024 21:49:24 -0800 Subject: [PATCH 3/6] debug action environment --- .github/actions/setup-runner-env/action.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/actions/setup-runner-env/action.yml b/.github/actions/setup-runner-env/action.yml index cc495881b..df4c1c581 100644 --- a/.github/actions/setup-runner-env/action.yml +++ b/.github/actions/setup-runner-env/action.yml @@ -5,6 +5,9 @@ description: Setup self-hosted runner environment runs: using: composite steps: + name: Dump env + shell: bash -eo pipefail {0} + run: echo "${{ toJSON(env) }}" - if: env.RUNNER_ENVIRONMENT == 'github-hosted' name: Free up disk space From 676f0fd26ee1d45e077c86dff2ae4e0ce2ef3772 Mon Sep 17 00:00:00 2001 From: Paul Taylor <178183+trxcllnt@users.noreply.github.com> Date: Thu, 1 Feb 2024 21:51:04 -0800 Subject: [PATCH 4/6] fix typo --- .github/actions/setup-runner-env/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-runner-env/action.yml b/.github/actions/setup-runner-env/action.yml index df4c1c581..5f37062d9 100644 --- a/.github/actions/setup-runner-env/action.yml +++ b/.github/actions/setup-runner-env/action.yml @@ -5,7 +5,7 @@ description: Setup self-hosted runner environment runs: using: composite steps: - name: Dump env + - name: Dump env shell: bash -eo pipefail {0} run: echo "${{ toJSON(env) }}" From d64c9b36824e5ee958cad48ced4db3e0b8db11fd Mon Sep 17 00:00:00 2001 From: Paul Taylor <178183+trxcllnt@users.noreply.github.com> Date: Fri, 2 Feb 2024 23:54:48 -0800 Subject: [PATCH 5/6] change conditional to `env.RUNNER_ENV == 'self-hosted' --- .github/actions/setup-runner-env/action.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/actions/setup-runner-env/action.yml b/.github/actions/setup-runner-env/action.yml index 5f37062d9..ae701557f 100644 --- a/.github/actions/setup-runner-env/action.yml +++ b/.github/actions/setup-runner-env/action.yml @@ -9,26 +9,26 @@ runs: shell: bash -eo pipefail {0} run: echo "${{ toJSON(env) }}" - - if: env.RUNNER_ENVIRONMENT == 'github-hosted' + - if: env.RUNNER_ENVIRONMENT != 'self-hosted' name: Free up disk space uses: ./.github/actions/free-disk-space with: tool_cache: "${{ runner.tool_cache }}" - - if: env.RUNNER_ENVIRONMENT != 'github-hosted' + - if: env.RUNNER_ENVIRONMENT == 'self-hosted' name: Setup self-hosted runner environment shell: bash -eo pipefail {0} run: | echo "HOME=${{ runner.workspace }}" >> $GITHUB_ENV; echo "TMPDIR=${{ runner.temp }}" >> $GITHUB_ENV; - - if: env.RUNNER_ENVIRONMENT != 'github-hosted' + - if: env.RUNNER_ENVIRONMENT == 'self-hosted' name: Setup Node.js uses: actions/setup-node@v3 with: node-version: '16' - - if: env.RUNNER_ENVIRONMENT == 'github-hosted' + - if: env.RUNNER_ENVIRONMENT != 'self-hosted' name: Set up QEMU uses: docker/setup-qemu-action@v2 @@ -36,14 +36,14 @@ runs: shell: bash run: docker context create builder - - if: env.RUNNER_ENVIRONMENT == 'github-hosted' + - if: env.RUNNER_ENVIRONMENT != 'self-hosted' name: Setup docker buildx on github-hosted runners uses: docker/setup-buildx-action@v2 with: buildkitd-flags: --debug endpoint: builder - - if: env.RUNNER_ENVIRONMENT != 'github-hosted' + - if: env.RUNNER_ENVIRONMENT == 'self-hosted' name: Setup docker buildx on self-hosted runners uses: docker/setup-buildx-action@v2 with: From 1c625ecb96358f10445d9285d22ea267a2b36e6e Mon Sep 17 00:00:00 2001 From: Paul Taylor <178183+trxcllnt@users.noreply.github.com> Date: Sat, 3 Feb 2024 00:00:33 -0800 Subject: [PATCH 6/6] revert changes to feature-matrix/action.yml --- .github/actions/feature-matrix/action.yml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/actions/feature-matrix/action.yml b/.github/actions/feature-matrix/action.yml index 0e7d250c6..f59855064 100644 --- a/.github/actions/feature-matrix/action.yml +++ b/.github/actions/feature-matrix/action.yml @@ -30,18 +30,11 @@ runs: files: | features/src/** features/test/** - .github/actions/build-and-test-feature/* - .github/actions/free-disk-space/* - .github/actions/build-linux-image/* - .github/actions/image-matrix/* - .github/actions/copy-common-scripts/* - .github/actions/get-pr-info/* - .github/actions/install-devcontainers-cli/* - .github/actions/devcontainer-json/* - .github/actions/setup-runner-env/* - .github/actions/feature-matrix/* .github/workflows/test.yml + .github/actions/feature-matrix/action.sh + .github/actions/feature-matrix/action.yml .github/workflows/build-and-test-feature.yml + .github/actions/build-and-test-feature/action.yml - name: Report changes if: inputs.full_matrix != 'true'