Test/branch (#38)

* fix: syntax * add dev workflow * fix versioning * refactor code * remove not needed permission
JTaeuber · Oct 22, 2024 · 86c55a7 · 86c55a7
1 parent ddb93cb
commit 86c55a7
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 39 deletions.
diff --git a/.github/workflows/assign.yaml b/.github/workflows/assign.yaml
@@ -5,7 +5,6 @@ on:
     types: [opened, reopened]
 
 permissions:
-  issues: write
   pull-requests: write
 
 jobs:

diff --git a/.github/workflows/check_version.yaml b/.github/workflows/check_version.yaml
@@ -13,6 +13,8 @@ jobs:
     outputs:
       version_change: ${{ steps.check_for_version_change.outputs.version_change }}
       app_version_change: ${{ steps.check_for_appVersion_change.outputs.app_version_change }}
+      version: ${{ steps.chart_version.outputs.version }}
+      app_version: ${{ steps.app_version.outputs.app_version }}
 
     steps:
       - name: Checkout code
@@ -32,11 +34,25 @@ jobs:
           version_change=$(git diff main HEAD~1 -- test-chart/Chart.yaml | grep -qe "^[+-]version: " && echo "version changed" || echo "version didn't change")
           echo "version_change=$version_change" >> $GITHUB_OUTPUT
 
+      - name: Extract Chart Version
+        id: chart_version
+        run: |
+          version=$(yq e '.version' ./test-chart/Chart.yaml)
+          echo "version=$version" >> $GITHUB_OUTPUT
+
+      - name: Extract App Version
+        id: app_version
+        run: |
+          app_version=$(yq e '.appVersion' ./test-chart/Chart.yaml)
+          echo "app_version=$app_version" >> $GITHUB_OUTPUT
+
       - name: Debug version echo
         id: debug
         run: |
           echo "app_version_change=${{ steps.check_for_appVersion_change.outputs.app_version_change }}"
           echo "version_change=${{ steps.check_for_version_change.outputs.version_change }}"
+          echo "version=${{ steps.chart_version.outputs.version }}"
+          echo "appVersion=${{ steps.app_version.outputs.app_version }}"
 
   build_new_chart:
     runs-on: ubuntu-latest
@@ -46,22 +62,13 @@ jobs:
       contents: write
 
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Extract Chart Version
-        id: chart_version
-        run: |
-          version=$(yq e '.version' ./test-chart/Chart.yaml)
-          echo "version=$version" >> $GITHUB_ENV
-
       - name: Dispatch event to build new helm chart
         uses: peter-evans/repository-dispatch@v3
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           repository: JTaeuber/test-chart
           event-type: build-new-chart
-          client-payload: '{"version": "${{ env.version }}"}'
+          client-payload: '{"version": "${{ needs.check_versions.outputs.version }}", "appVersion": "${{ needs.check_versions.outputs.app_version }}"}'
 
   release_new_version:
     runs-on: ubuntu-latest
@@ -71,19 +78,10 @@ jobs:
       contents: write
 
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Extract App Version
-        id: app_version
-        run: |
-          app_version=$(yq e '.appVersion' ./test-chart/Chart.yaml)
-          echo "app_version=$app_version" >> $GITHUB_ENV
-
       - name: Dispatch event to release new version
         uses: peter-evans/repository-dispatch@v3
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           repository: JTaeuber/test-chart
           event-type: release-new-version
-          client-payload: '{"appVersion": "${{ env.app_version }}"}'
+          client-payload: '{"appVersion": "${{ needs.check_versions.outputs.app_version }}", "setLatest": true}'
diff --git a/.github/workflows/create_dev_build.yaml b/.github/workflows/create_dev_build.yaml
@@ -25,4 +25,4 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           repository: JTaeuber/test-chart
           event-type: create-dev-build
-          client-payload: '{"version": "${{ env.version }}-dev"}'
+          client-payload: '{"version": "${{ env.version }}-dev","appVersion": "dev", "setLatest": false}'
diff --git a/.github/workflows/docker_build.yaml b/.github/workflows/docker_build.yaml
@@ -8,20 +8,19 @@ jobs:
   build_and_push:
     runs-on: ubuntu-latest
     steps:
-      - name: Set tags
-        id: set-tags
+      - name: Docker meta
+        id: meta
         if: github.event.action == 'release-new-version'
-        run: |
-          TAG1="latest"
-          TAG2="${{ github.event.client_payload.appVersion }}"
-
-          echo "$TAG1"
-          echo "$TAG2"
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ghcr.io/JTaeuber/test-chart
+          tags: |
+            ${{ github.event.client_payload.setLatest && 'latest' }}
+            ${{ github.event.client_payload.appVersion }}
 
-      - name: Set dev tag
-        id: set-dev-tag
-        if: github.event.action == 'create-dev-build'
+      - name: Echo tags
+        id: echo-tags
+        if: github.event.action == 'release-new-version'
         run: |
-          TAG="dev"
-
-          echo "$TAG"
+          echo ${{ steps.meta.outputs.tags }}
diff --git a/.github/workflows/helm_build.yaml b/.github/workflows/helm_build.yaml
@@ -30,7 +30,7 @@ jobs:
         run: |
           cd test-chart
           helm lint .
-          helm package .
+          helm package . --version ${{ github.event.client_payload.version }} --app-version --version ${{ github.event.client_payload.appVersion }}
           helm push $(ls *.tgz | head -1) oci://ghcr.io/jtaeuber/charts
           helm push $(ls *.tgz | head -1) oci://${MTR}/${REPO}/charts
         env:

diff --git a/test-chart/Chart.yaml b/test-chart/Chart.yaml
@@ -5,5 +5,5 @@ type: application
 keywords:
   - testing
   - helm-chart
-version: 1.1.0
-appVersion: 1.1.0
+version: 1.1.1
+appVersion: 1.1.1