Skip to content

Commit c065ab3

Browse files
authored
fix: fix shared-zerv-versioning.yml (#150)
1 parent 1a77051 commit c065ab3

File tree

6 files changed

+19
-337
lines changed

6 files changed

+19
-337
lines changed

.claude/plan/01-fix-annotated-tag-bug.md

Lines changed: 0 additions & 144 deletions
This file was deleted.

.claude/plan/02-rewrite-get-latest-tag-for-annotated-tags.md

Lines changed: 0 additions & 177 deletions
This file was deleted.

.github/workflows/shared-zerv-versioning.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
zerv_version:
1010
type: string
1111
required: false
12-
description: "Version of zerv to install (e.g., '0.7.84'). If not specified, installs latest version"
12+
description: "Version of zerv to install (e.g., '0.7.96'). If not specified, installs latest version"
1313
schema:
1414
type: string
1515
description: "Zerv flow schema"
@@ -57,8 +57,8 @@ on:
5757
default: >-
5858
{
5959
"docker_tag": "{{ semver_obj.docker }}",
60-
"v_major": "v{{ major | default(value='0') }}",
61-
"v_major_minor": "v{{ major | default(value='0') }}{{ prefix_if(value=minor, prefix='.') }}"
60+
"v_major": "v{{ major | default(value=\\\"0\\\") }}",
61+
"v_major_minor": "v{{ major | default(value=\\\"0\\\") }}{{ prefix_if(value=minor, prefix=\\\".\\\") }}"
6262
}
6363
custom_outputs:
6464
type: string
@@ -87,6 +87,7 @@ jobs:
8787
toolchain: stable
8888

8989
- name: Restore cache
90+
id: cache-zerv
9091
uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
9192
with:
9293
path: |
@@ -96,6 +97,7 @@ jobs:
9697
~/.cargo/git/db/
9798
key: cargo-zerv-${{ runner.os }}-${{ inputs.zerv_version || 'latest' }}
9899
restore-keys: |
100+
cargo-zerv-${{ runner.os }}-${{ inputs.zerv_version || 'latest' }}-
99101
cargo-zerv-${{ runner.os }}-
100102
101103
- name: Install zerv
@@ -279,4 +281,4 @@ jobs:
279281
~/.cargo/registry/index/
280282
~/.cargo/registry/cache/
281283
~/.cargo/git/db/
282-
key: cargo-zerv-${{ runner.os }}-${{ inputs.zerv_version || 'latest' }}
284+
key: ${{ steps.cache-zerv.outputs.cache-primary-key }}-${{ github.run_id }}-${{ github.run_attempt }}

.github/workflows/test.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,17 @@ jobs:
3232
run: cargo build --verbose
3333

3434
- name: Restore cache
35+
id: cache
3536
uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
3637
with:
3738
path: |
3839
~/.cargo/bin/
3940
~/.cargo/registry/index/
4041
~/.cargo/registry/cache/
4142
~/.cargo/git/db/
42-
key: cargo-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-${{ github.run_id }}
43+
key: cargo-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}
4344
restore-keys: |
44-
cargo-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}
45+
cargo-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-
4546
cargo-${{ runner.os }}-
4647
4748
- run: cargo install cargo-tarpaulin --locked || true
@@ -58,7 +59,7 @@ jobs:
5859
~/.cargo/registry/index/
5960
~/.cargo/registry/cache/
6061
~/.cargo/git/db/
61-
key: cargo-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-${{ github.run_id }}
62+
key: ${{ steps.cache.outputs.cache-primary-key }}-${{ github.run_id }}-${{ github.run_attempt }}
6263

6364
- name: SonarQube Scan
6465
if: matrix.os == 'ubuntu-latest'

0 commit comments

Comments
 (0)