|
54 | 54 | description: > |
55 | 55 | Container to use for builds |
56 | 56 | required: false |
57 | | - default: 'sxscollaboration/spectre:dev' |
| 57 | + default: 'nilsvu/spectre:dev' |
58 | 58 | # Allow running this workflow as a job in another workflow. This is used to |
59 | 59 | # test a new Docker container before publishing it. |
60 | 60 | workflow_call: |
|
64 | 64 | Container to use for builds |
65 | 65 | required: false |
66 | 66 | type: string |
67 | | - default: 'sxscollaboration/spectre:dev' |
| 67 | + default: 'nilsvu/spectre:dev' |
68 | 68 |
|
69 | 69 | # Cancel all other queued or in-progress runs of this workflow when it is |
70 | 70 | # scheduled, so repeated pushes to a branch or a PR don't block CI. Repeated |
@@ -113,7 +113,7 @@ jobs: |
113 | 113 | name: Files and formatting |
114 | 114 | runs-on: ubuntu-latest |
115 | 115 | container: |
116 | | - image: ${{ inputs.container || 'sxscollaboration/spectre:dev' }} |
| 116 | + image: ${{ inputs.container || 'nilsvu/spectre:dev' }} |
117 | 117 | steps: |
118 | 118 | - name: Checkout repository |
119 | 119 | uses: actions/checkout@v5 |
@@ -216,7 +216,7 @@ jobs: |
216 | 216 | || github.ref != 'refs/heads/develop' |
217 | 217 | runs-on: ubuntu-latest |
218 | 218 | container: |
219 | | - image: ${{ inputs.container || 'sxscollaboration/spectre:dev' }} |
| 219 | + image: ${{ inputs.container || 'nilsvu/spectre:dev' }} |
220 | 220 | strategy: |
221 | 221 | fail-fast: false |
222 | 222 | matrix: |
@@ -295,7 +295,7 @@ jobs: |
295 | 295 | needs: check_files_and_formatting |
296 | 296 | runs-on: ubuntu-latest |
297 | 297 | container: |
298 | | - image: ${{ inputs.container || 'sxscollaboration/spectre:dev' }} |
| 298 | + image: ${{ inputs.container || 'nilsvu/spectre:dev' }} |
299 | 299 | env: |
300 | 300 | CCACHE_DIR: /work/ccache |
301 | 301 | CCACHE_READONLY: 1 |
@@ -545,7 +545,7 @@ jobs: |
545 | 545 | use_xsimd: "OFF" |
546 | 546 |
|
547 | 547 | container: |
548 | | - image: ${{ inputs.container || 'sxscollaboration/spectre:dev' }} |
| 548 | + image: ${{ inputs.container || 'nilsvu/spectre:dev' }} |
549 | 549 | volumes: |
550 | 550 | - /usr/local:/mnt/host-usr-local |
551 | 551 | - /usr/share:/mnt/host-usr-share |
@@ -889,15 +889,21 @@ ${{ matrix.build_type }}-pch-${{ matrix.use_pch || 'ON' }}" |
889 | 889 | # Delete unused cache entries before uploading the cache |
890 | 890 | - name: Clean up ccache |
891 | 891 | if: github.ref == 'refs/heads/develop' |
| 892 | + || github.ref == 'refs/heads/upgrade_container' |
892 | 893 | run: | |
893 | 894 | now=$(date +%s) |
894 | 895 | job_duration=$((now - ${{ steps.start.outputs.time }})) |
895 | 896 | ccache --evict-older-than "${job_duration}s" |
896 | 897 | # Save the cache after everything has been built. Also save on failure or |
897 | 898 | # on cancellation (`always()`) because a partial cache is better than no |
898 | 899 | # cache. |
| 900 | + # |
| 901 | + # TEMPORARY, REMOVE BEFORE MERGING: also save on the container-upgrade |
| 902 | + # branch, which needs to warm its own cache because the new container |
| 903 | + # invalidates every entry. Branch caches are only visible to that branch. |
899 | 904 | - name: Save ccache |
900 | | - if: always() && github.ref == 'refs/heads/develop' |
| 905 | + if: always() && (github.ref == 'refs/heads/develop' |
| 906 | + || github.ref == 'refs/heads/upgrade_container') |
901 | 907 | uses: actions/cache/save@v5 |
902 | 908 | with: |
903 | 909 | path: /work/ccache |
@@ -1421,7 +1427,7 @@ ${{ matrix.build_type }}-pch-${{ matrix.use_pch || 'ON' }}" |
1421 | 1427 | "-skl;skylake" "-icx;icelake-server" "-tgl;tigerlake") |
1422 | 1428 | compiler: clang-21 |
1423 | 1429 | container: |
1424 | | - image: ${{ inputs.container || 'sxscollaboration/spectre:dev' }} |
| 1430 | + image: ${{ inputs.container || 'nilsvu/spectre:dev' }} |
1425 | 1431 | env: |
1426 | 1432 | # See the unit test job for the reasons for these configuration choices |
1427 | 1433 | CXXFLAGS: "-Werror" |
|
0 commit comments