diff --git a/.github/scripts/commit-and-tag.cjs b/.github/scripts/commit-and-tag.cjs index 086e1b83e..53d63f542 100644 --- a/.github/scripts/commit-and-tag.cjs +++ b/.github/scripts/commit-and-tag.cjs @@ -55,7 +55,7 @@ module.exports = async ({ github, context }) => { const tag = await github.rest.git.createTag({ owner, repo, - tag: `v${version}`, + tag: `letro-v${version}`, message: version, type: "commit", object: commit.data.sha, diff --git a/.github/scripts/create-version-tag.cjs b/.github/scripts/create-version-tag.cjs index 47e00ecb1..3d78b3467 100644 --- a/.github/scripts/create-version-tag.cjs +++ b/.github/scripts/create-version-tag.cjs @@ -17,7 +17,7 @@ module.exports = async ({ github, context }) => { const tag = await github.rest.git.createRef({ owner, repo, - ref: `refs/tags/v${version}`, + ref: `refs/tags/letro-v${version}`, sha: tagSha, }); console.log("Created tag ref:", tag.data.url); diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 612aac345..b3f60fdb9 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -11,7 +11,7 @@ on: - main - "release/**" tags: - - "v*" + - "letro-v*" # Run when there is a label change on the pull request # This runs only if the 'Z-Build-Workflow' is added to the pull request @@ -50,7 +50,7 @@ jobs: - name: Compute version and timestamp out of git history id: git run: | - echo "describe=$(git describe --tags --match 'v*.*.*' --always)" >> $GITHUB_OUTPUT + echo "describe=$(git describe --tags --match 'letro-v*.*.*' --always)" >> $GITHUB_OUTPUT echo "timestamp=$(git log -1 --format=%ct)" >> $GITHUB_OUTPUT build-assets: @@ -208,6 +208,16 @@ jobs: SOURCE_DATE_EPOCH: ${{ needs.compute-version.outputs.timestamp }} steps: + - name: Extract semver version from letro tag + id: tag-semver + run: | + tag="${{ github.ref_name }}" + if [[ "$tag" == letro-v* ]]; then + echo "version=${tag#letro-v}" >> "$GITHUB_OUTPUT" + else + echo "version=" >> "$GITHUB_OUTPUT" + fi + - name: Docker meta id: meta uses: docker/metadata-action@v6.0.0 @@ -219,9 +229,9 @@ jobs: tags: | type=ref,event=branch type=ref,event=pr - type=semver,pattern={{version}} - type=semver,pattern={{major}}.{{minor}} - type=semver,pattern={{major}} + type=semver,pattern={{version}},value=${{ steps.tag-semver.outputs.version }},enable=${{ steps.tag-semver.outputs.version != '' }} + type=semver,pattern={{major}}.{{minor}},value=${{ steps.tag-semver.outputs.version }},enable=${{ steps.tag-semver.outputs.version != '' }} + type=semver,pattern={{major}},value=${{ steps.tag-semver.outputs.version }},enable=${{ steps.tag-semver.outputs.version != '' }} type=sha - name: Docker meta (debug variant) @@ -236,9 +246,9 @@ jobs: tags: | type=ref,event=branch type=ref,event=pr - type=semver,pattern={{version}} - type=semver,pattern={{major}}.{{minor}} - type=semver,pattern={{major}} + type=semver,pattern={{version}},value=${{ steps.tag-semver.outputs.version }},enable=${{ steps.tag-semver.outputs.version != '' }} + type=semver,pattern={{major}}.{{minor}},value=${{ steps.tag-semver.outputs.version }},enable=${{ steps.tag-semver.outputs.version != '' }} + type=semver,pattern={{major}},value=${{ steps.tag-semver.outputs.version }},enable=${{ steps.tag-semver.outputs.version != '' }} type=sha - name: Setup Cosign @@ -284,7 +294,7 @@ jobs: # Only sign on tags and on commits on main branch if: | github.event_name != 'pull_request' - && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') + && (startsWith(github.ref, 'refs/tags/letro-v') || github.ref == 'refs/heads/main') env: REGULAR_DIGEST: ${{ steps.output.outputs.metadata && fromJSON(steps.output.outputs.metadata).regular.digest }} diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ee352baa3..89da690f4 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -11,7 +11,7 @@ on: - main - "release/**" tags: - - "v*" + - "letro-v*" pull_request: concurrency: