From 341e3263603b751b2bfe99122668c280085046c8 Mon Sep 17 00:00:00 2001 From: Luca Terracciano Date: Tue, 6 May 2025 14:22:05 +0200 Subject: [PATCH 1/2] ci: trigger docker image build --- .build-tools/containers/buildenv/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/.build-tools/containers/buildenv/Dockerfile b/.build-tools/containers/buildenv/Dockerfile index dacf918..0c80359 100644 --- a/.build-tools/containers/buildenv/Dockerfile +++ b/.build-tools/containers/buildenv/Dockerfile @@ -18,4 +18,5 @@ RUN git clone -b v0.3.28 --single-branch --depth 1 https://github.com/OpenMathLi sudo make PREFIX=/usr/local install && \ sudo rm -rf ${HOME}/OpenBLAS + WORKDIR $HOME \ No newline at end of file From a0e19717f608b5e18376808e4f8c11950df9f56f Mon Sep 17 00:00:00 2001 From: Luca Terracciano Date: Tue, 6 May 2025 14:23:43 +0200 Subject: [PATCH 2/2] ci: fix workflow imports --- .github/workflows/master.yml | 8 ++++---- .github/workflows/pr-development-workflow.yml | 4 ++-- .github/workflows/pr-development.yml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 40b6d94..ab373ad 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -12,13 +12,13 @@ env: jobs: build-docker-arm64: - uses: Algebraic-Programming/TaskR/.github/workflows/master-build-workflow.yml@master + uses: Algebraic-Programming/TaskR/.github/workflows/master-build-workflow.yml@main with: os: ubuntu-24.04-arm arch: arm64 build-docker-amd64: - uses: Algebraic-Programming/TaskR/.github/workflows/master-build-workflow.yml@master + uses: Algebraic-Programming/TaskR/.github/workflows/master-build-workflow.yml@main with: os: ubuntu-24.04 arch: amd64 @@ -50,7 +50,7 @@ jobs: if: | always() && (contains(needs.push-buildenv-manifest.result, 'success') || contains(needs.push-buildenv-manifest.result, 'skipped')) - uses: Algebraic-Programming/TaskR/.github/workflows/master-test-workflow.yml@master + uses: Algebraic-Programming/TaskR/.github/workflows/master-test-workflow.yml@main with: os: ubuntu-24.04-arm arch: arm64 @@ -60,7 +60,7 @@ jobs: if: | always() && (contains(needs.push-buildenv-manifest.result, 'success') || contains(needs.push-buildenv-manifest.result, 'skipped')) - uses: Algebraic-Programming/TaskR/.github/workflows/master-test-workflow.yml@master + uses: Algebraic-Programming/TaskR/.github/workflows/master-test-workflow.yml@main with: os: ubuntu-24.04 arch: amd64 diff --git a/.github/workflows/pr-development-workflow.yml b/.github/workflows/pr-development-workflow.yml index db91fa0..9b50b59 100644 --- a/.github/workflows/pr-development-workflow.yml +++ b/.github/workflows/pr-development-workflow.yml @@ -37,14 +37,14 @@ jobs: # Check the PR diff using the current branch and the base branch of the PR - name: Run git diff run: | - git diff --name-only origin/master ${{ github.event.pull_request.head.sha }} > ${{ runner.temp }}/diff.txt + git diff --name-only origin/main ${{ github.event.pull_request.head.sha }} > ${{ runner.temp }}/diff.txt - name: Check if Dockerfile was modified id: check-dockerfile env: MODIFIED_FILES_PATH: ${{ runner.temp }}/diff.txt run: | - echo "$(git rev-parse origin/master)" + echo "$(git rev-parse origin/main)" echo "$(git rev-parse ${{ github.event.pull_request.head.sha }})" cat $MODIFIED_FILES_PATH if cat $MODIFIED_FILES_PATH | grep -q 'buildenv/Dockerfile' ; then diff --git a/.github/workflows/pr-development.yml b/.github/workflows/pr-development.yml index 7841297..df9dd4d 100644 --- a/.github/workflows/pr-development.yml +++ b/.github/workflows/pr-development.yml @@ -13,13 +13,13 @@ concurrency: jobs: ci-arm64: - uses: algebraic-programming/TaskR/.github/workflows/pr-development-workflow.yml@master + uses: Algebraic-Programming/TaskR/.github/workflows/pr-development-workflow.yml@main with: os: ubuntu-24.04-arm arch: arm64 ci-amd64: - uses: algebraic-programming/TaskR/.github/workflows/pr-development-workflow.yml@master + uses: Algebraic-Programming/TaskR/.github/workflows/pr-development-workflow.yml@main with: os: ubuntu-24.04 arch: amd64 \ No newline at end of file