Skip to content

Commit

Permalink
Remove last vestiges of old manual CACHE_BUSTER
Browse files Browse the repository at this point in the history
It was error prone so there's a slightly less error prone way
that we moved to as represented here.

To really make this not error prone, we'd need to move the the
system as seen in:

#3825
  • Loading branch information
SeanTAllen committed Jul 5, 2022
1 parent 06a9542 commit 69870cb
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -291,42 +291,42 @@ task:
container:
image: ponylang/ponyc-ci-x86-64-unknown-linux-rocky8-builder:20210707
environment:
CACHE_BUSTER: 20210707
IMAGE: ponylang/ponyc-ci-x86-64-unknown-linux-rocky8-builder:20210707
TRIPLE_VENDOR: unknown
TRIPLE_OS: linux-rocky8
- name: "nightly: x86-64-unknown-linux-gnu"
container:
image: ponylang/ponyc-ci-x86-64-unknown-linux-gnu-builder:20200423
environment:
CACHE_BUSTER: 20210224
IMAGE: ponylang/ponyc-ci-x86-64-unknown-linux-gnu-builder:20200423
TRIPLE_VENDOR: unknown
TRIPLE_OS: linux-gnu
- name: "nightly: x86-64-unknown-linux-ubuntu18.04"
container:
image: ponylang/ponyc-ci-x86-64-unknown-linux-ubuntu18.04-builder:20210714
environment:
CACHE_BUSTER: 20210714
IMAGE: ponylang/ponyc-ci-x86-64-unknown-linux-ubuntu18.04-builder:20210714
TRIPLE_VENDOR: unknown
TRIPLE_OS: linux-ubuntu18.04
- name: "nightly: x86-64-unknown-linux-ubuntu20.04"
container:
image: ponylang/ponyc-ci-x86-64-unknown-linux-ubuntu20.04-builder:20200830
environment:
CACHE_BUSTER: 20210224
IMAGE: ponylang/ponyc-ci-x86-64-unknown-linux-ubuntu20.04-builder:20200830
TRIPLE_VENDOR: unknown
TRIPLE_OS: linux-ubuntu20.04
- name: "nightly: x86-64-unknown-linux-ubuntu22.04"
container:
image: ponylang/ponyc-ci-x86-64-unknown-linux-ubuntu22.04-builder:20220426
environment:
CACHE_BUSTER: 20220426
IMAGE: ponylang/ponyc-ci-x86-64-unknown-linux-ubuntu22.04-builder:20220426
TRIPLE_VENDOR: unknown
TRIPLE_OS: linux-ubuntu22.04
- name: "nightly: x86-64-unknown-linux-musl"
container:
image: ponylang/ponyc-ci-x86-64-unknown-linux-musl-builder:20220611
environment:
CACHE_BUSTER: 20220611
IMAGE: ponylang/ponyc-ci-x86-64-unknown-linux-musl-builder:20220611
TRIPLE_VENDOR: unknown
TRIPLE_OS: linux-musl

Expand All @@ -340,7 +340,7 @@ task:
libs_cache:
folder: build/libs
fingerprint_script:
- echo "`md5sum lib/CMakeLists.txt` ${TRIPLE_VENDOR}-${TRIPLE_OS} ${CACHE_BUSTER}"
- echo "`md5sum lib/CMakeLists.txt` ${IMAGE}"
populate_script: make libs build_flags=-j8
upload_caches:
- libs
Expand Down Expand Up @@ -490,42 +490,42 @@ task:
container:
image: ponylang/ponyc-ci-x86-64-unknown-linux-rocky8-builder:20210707
environment:
CACHE_BUSTER: 20210707
IMAGE: ponylang/ponyc-ci-x86-64-unknown-linux-rocky8-builder:20210707
TRIPLE_VENDOR: unknown
TRIPLE_OS: linux-rocky8
- name: "release: x86-64-unknown-linux-gnu"
container:
image: ponylang/ponyc-ci-x86-64-unknown-linux-gnu-builder:20200423
environment:
CACHE_BUSTER: 20200423
IMAGE: ponylang/ponyc-ci-x86-64-unknown-linux-gnu-builder:20200423
TRIPLE_VENDOR: unknown
TRIPLE_OS: linux-gnu
- name: "release: x86-64-unknown-linux-ubuntu18.04"
container:
image: ponylang/ponyc-ci-x86-64-unknown-linux-ubuntu18.04-builder:20210714
environment:
CACHE_BUSTER: 20210714
IMAGE: ponylang/ponyc-ci-x86-64-unknown-linux-ubuntu18.04-builder:20210714
TRIPLE_VENDOR: unknown
TRIPLE_OS: linux-ubuntu18.04
- name: "release: x86-64-unknown-linux-ubuntu20.04"
container:
image: ponylang/ponyc-ci-x86-64-unknown-linux-ubuntu20.04-builder:20200830
environment:
CACHE_BUSTER: 20200830
IMAGE: ponylang/ponyc-ci-x86-64-unknown-linux-ubuntu20.04-builder:20200830
TRIPLE_VENDOR: unknown
TRIPLE_OS: linux-ubuntu20.04
- name: "nightly: x86-64-unknown-linux-ubuntu22.04"
container:
image: ponylang/ponyc-ci-x86-64-unknown-linux-ubuntu22.04-builder:20220426
environment:
CACHE_BUSTER: 20220426
IMAGE: ponylang/ponyc-ci-x86-64-unknown-linux-ubuntu22.04-builder:20220426
TRIPLE_VENDOR: unknown
TRIPLE_OS: linux-ubuntu22.04
- name: "release: x86-64-unknown-linux-musl"
container:
image: ponylang/ponyc-ci-x86-64-unknown-linux-musl-builder:20210420
environment:
CACHE_BUSTER: 20200421
IMAGE: ponylang/ponyc-ci-x86-64-unknown-linux-musl-builder:20210420
TRIPLE_VENDOR: unknown
TRIPLE_OS: linux-musl

Expand All @@ -539,7 +539,7 @@ task:
libs_cache:
folder: build/libs
fingerprint_script:
- echo "`md5sum lib/CMakeLists.txt` ${TRIPLE_VENDOR}-${TRIPLE_OS} ${CACHE_BUSTER}"
- echo "`md5sum lib/CMakeLists.txt` ${IMAGE}"
populate_script: make libs build_flags=-j8
upload_caches:
- libs
Expand Down

0 comments on commit 69870cb

Please sign in to comment.