From 37ce6fe7a5a410fa3e19b3ee50dcfc316152a0f8 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Thu, 5 Oct 2023 09:55:56 +1100 Subject: [PATCH 1/2] build-docker-image.yml: uses self-hosted runner --- .github/workflows/build-docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml index a59eaa6..947817b 100644 --- a/.github/workflows/build-docker-image.yml +++ b/.github/workflows/build-docker-image.yml @@ -31,7 +31,7 @@ jobs: build-and-push-image: name: Build ${{ inputs.container-name }} - runs-on: ubuntu-latest + runs-on: [self-hosted, linux, x64] permissions: contents: read From 9f00c78d851a8f5e0fa55eba95c6cb0c509e3bda Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Thu, 5 Oct 2023 10:13:40 +1100 Subject: [PATCH 2/2] REMOVE: workflows reference 112-nirin-workflows --- .github/workflows/dep-image-1-start.yml | 2 +- .github/workflows/dep-image-2-build-base.yml | 4 ++-- .github/workflows/dep-image-3-build.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dep-image-1-start.yml b/.github/workflows/dep-image-1-start.yml index bea83dd..672a7e5 100644 --- a/.github/workflows/dep-image-1-start.yml +++ b/.github/workflows/dep-image-1-start.yml @@ -48,7 +48,7 @@ jobs: fail-fast: false matrix: compiler: ${{ fromJson(needs.generate-matrix.outputs.compilers) }} - uses: access-nri/build-ci/.github/workflows/dep-image-2-build-base.yml@main + uses: access-nri/build-ci/.github/workflows/dep-image-2-build-base.yml@112-nirin-workflows with: compiler-name: ${{ matrix.compiler.name }} compiler-package: ${{ matrix.compiler.package }} diff --git a/.github/workflows/dep-image-2-build-base.yml b/.github/workflows/dep-image-2-build-base.yml index adbbc90..2dc5a61 100644 --- a/.github/workflows/dep-image-2-build-base.yml +++ b/.github/workflows/dep-image-2-build-base.yml @@ -47,7 +47,7 @@ jobs: needs: - base-spack-image-check if: needs.base-spack-image-check.outputs.no-image-exists - uses: access-nri/build-ci/.github/workflows/build-docker-image.yml@main + uses: access-nri/build-ci/.github/workflows/build-docker-image.yml@112-nirin-workflows with: container-registry: ghcr.io container-name: access-nri/base-spack-${{ inputs.compiler-name }}${{ inputs.compiler-version }}-${{ inputs.spack-packages-version }} @@ -79,7 +79,7 @@ jobs: fail-fast: false matrix: model: ${{ fromJson(inputs.models) }} - uses: access-nri/build-ci/.github/workflows/dep-image-3-build.yml@main + uses: access-nri/build-ci/.github/workflows/dep-image-3-build.yml@112-nirin-workflows with: compiler-name: ${{ inputs.compiler-name }} compiler-package: ${{ inputs.compiler-package }} diff --git a/.github/workflows/dep-image-3-build.yml b/.github/workflows/dep-image-3-build.yml index d258162..e7a90f7 100644 --- a/.github/workflows/dep-image-3-build.yml +++ b/.github/workflows/dep-image-3-build.yml @@ -33,7 +33,7 @@ jobs: name: Build build-${{ inputs.model }}-${{ inputs.compiler-name}}${{ inputs.compiler-version }}-${{ inputs.spack-packages-version }} needs: - setup-dependency-image - uses: access-nri/build-ci/.github/workflows/build-docker-image.yml@main + uses: access-nri/build-ci/.github/workflows/build-docker-image.yml@112-nirin-workflows with: container-registry: ghcr.io container-name: access-nri/build-${{ inputs.model}}-${{ inputs.compiler-name }}${{ inputs.compiler-version }}-${{ inputs.spack-packages-version }}