From 18c4a61c43f424c3e54aba77a0d0f43a29b62585 Mon Sep 17 00:00:00 2001 From: bennibbelink <79653949+bennibbelink@users.noreply.github.com> Date: Sat, 17 Feb 2024 18:58:45 -0600 Subject: [PATCH 1/2] cache-to in correct workflow file --- .github/workflows/publish_latest.yml | 1 + .github/workflows/publish_release.yml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_latest.yml b/.github/workflows/publish_latest.yml index 5cfae67644..66df180706 100644 --- a/.github/workflows/publish_latest.yml +++ b/.github/workflows/publish_latest.yml @@ -57,6 +57,7 @@ jobs: uses: docker/build-push-action@v5 with: cache-from: type=registry,ref=ghcr.io/cyclus/cyclus_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cyclus:ci-layer-cache + cache-to: type=registry,ref=ghcr.io/cyclus/cyclus_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cyclus:ci-layer-cache,mode=max file: docker/Dockerfile push: true tags: ghcr.io/cyclus/cyclus_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cyclus:${{ env.tag }} diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index e5c9a96ae8..d94f443126 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -56,7 +56,6 @@ jobs: uses: docker/build-push-action@v5 with: cache-from: type=registry,ref=ghcr.io/cyclus/cyclus_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cyclus:ci-layer-cache - cache-to: type=registry,ref=ghcr.io/cyclus/cyclus_${{ matrix.ubuntu_versions }}_${{ matrix.pkg_mgr }}/cyclus:ci-layer-cache,mode=max file: docker/Dockerfile push: true tags: | From b446a78de90d1b0e062fc1a56b03014144c87104 Mon Sep 17 00:00:00 2001 From: bennibbelink <79653949+bennibbelink@users.noreply.github.com> Date: Sat, 17 Feb 2024 19:01:09 -0600 Subject: [PATCH 2/2] update CHANGELOG --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e2115d2412..c8f6895d89 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -17,7 +17,7 @@ Since last release will fail unless update-alternatives has been used to point python at the correct python3 version (#1558) * build and test are now fown on githubAction in place or CircleCI (#1569) -* Have separate workflows for testing, publishing dependency images, and publishing release images (#1597, #1602, #1606, #1609, #1629, #1633, #1637, #1668) +* Have separate workflows for testing, publishing dependency images, and publishing release images (#1597, #1602, #1606, #1609, #1629, #1633, #1637, #1668, #1672) * Add Ubuntu 20.04 to the list of supported platforms (#1605, #1608) * Add random number generator (Mersenne Twister 19937, from boost) and the ability to set the seed in the simulation control block (#1599) * Added code coverage reporting to GitHub workflows (#1616)