diff --git a/.github/workflows/build-chart.yml b/.github/workflows/build-chart.yml index 290f06b..592094e 100644 --- a/.github/workflows/build-chart.yml +++ b/.github/workflows/build-chart.yml @@ -58,7 +58,7 @@ jobs: run: | changed=$(ct list-changed --target-branch main) if [[ -n "$changed" ]]; then - echo "::set-output name=changed::true" + echo "changed=true" >> $GITHUB_OUTPUT fi if: false #not implemented/working yet diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0fd012a..5b97db2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,10 @@ on: jobs: versioning: - uses: ./.github/workflows/versioning.yml + uses: f2calv/gha-workflows/.github/workflows/gha-release-versioning.yml@v1 + with: + tag-prefix: '' + tag-and-release: false app: uses: ./.github/workflows/build-app.yml @@ -45,6 +48,9 @@ jobs: needs: [versioning, app, image, chart] if: github.ref == 'refs/heads/main' uses: f2calv/gha-workflows/.github/workflows/gha-release-versioning.yml@v1 + permissions: + contents: write with: + semVer: ${{ needs.versioning.outputs.semVer }} tag-prefix: '' move-major-tag: false \ No newline at end of file diff --git a/.github/workflows/versioning.yml b/.github/workflows/versioning.yml deleted file mode 100644 index 669b517..0000000 --- a/.github/workflows/versioning.yml +++ /dev/null @@ -1,47 +0,0 @@ -name: versioning - -on: - workflow_call: - outputs: - semVer: - description: i.e. 1.2.3 - value: ${{ jobs.get-version.outputs.semVer }} - fullSemVer: - description: i.e. 1.2.3-feature-my-feature.12 - value: ${{ jobs.get-version.outputs.fullSemVer }} - -jobs: - get-version: - runs-on: ubuntu-latest - outputs: - semVer: ${{ steps.gitversion.outputs.semVer }} - fullSemVer: ${{ steps.gitversion.outputs.fullSemVer }} - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - uses: actions/setup-dotnet@v4 - with: - dotnet-version: 8.0.x - - - name: gitversion (1 of 3) - run: | - FILE=GitVersion.yml - if [[ -f "$FILE" ]]; then - echo "$FILE exists" - else - echo "::error file=GitVersion.yml::Repository versioning is managed by GitVersion, '$FILE' is therefore required!" - fi - - - name: gitversion (2 of 3) - uses: gittools/actions/gitversion/setup@v1 - with: - versionSpec: 5.x - - - name: gitversion (3 of 3) - id: gitversion - uses: gittools/actions/gitversion/execute@v1 - with: - useConfigFile: true - additionalArguments: /nofetch \ No newline at end of file