Merge main into gh-pages

Worth-NL · Apr 16, 2024 · 828517d · 828517d
2 parents 3eabf76 + 8931694
commit 828517d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -12,16 +12,23 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout ✅
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.2
         with:
           fetch-depth: 0
       - name: Helm docs 🤖
-        uses: losisin/helm-docs-github-action@v1.2.1
+        uses: losisin/helm-docs-github-action@v1.2.5
         with:
           git-push: true
           git-push-user-name: "${{ github.actor }}"
           git-push-user-email: "${{ github.actor }}@users.noreply.github.com"
           git-commit-message: "🧹 update chart documentation"
+      - name: Merge to gh-pages 📖
+        uses: devmasx/merge-branch@1.4.0
+        with:
+          type: now
+          from_branch: main
+          target_branch: gh-pages
+          github_token: "${{ secrets.GITHUB_TOKEN }}"
   release:
     if: ${{ always() }}
     needs: [docs]
@@ -30,15 +37,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout ✅
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.2
         with:
           fetch-depth: 0
       - name: Configure Git 🧰
         run: |
           git config user.name "${{ github.actor }}"
-          git config user.email "${{ github.actor }}@users.noreply.github.com"      
+          git config user.email "${{ github.actor }}@users.noreply.github.com"
       - name: Install Helm ⎈
-        uses: azure/setup-helm@v4
+        uses: azure/setup-helm@v4.1.0
       - name: Prepare GPG 🔒
         run: |
           gpg_dir=.cr-gpg
@@ -51,7 +58,7 @@ jobs:
           echo "CR_KEYRING=$keyring" >> "$GITHUB_ENV"
         env:
           GPG_KEYRING_BASE64: "${{ secrets.GPG_KEYRING_BASE64 }}" #Referring secrets of github above
-          GPG_PASSPHRASE: "${{ secrets.GPG_PASSPHRASE }}" 
+          GPG_PASSPHRASE: "${{ secrets.GPG_PASSPHRASE }}"
       - name: Add dependency repos 🔗
         run: |
           helm repo add denhaag https://gemeente-denhaag.github.io/helm-charts/

diff --git a/notifynl-omc/Chart.yaml b/notifynl-omc/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: notifynl-omc
-version: "0.3.0-beta"
-appVersion: "1.6.6.1"
+version: "0.3.1-beta"
+appVersion: "1.6.7"
 kubeVersion: ">=1.26.6"
 description: "Chart to deploy the NotifyNL OMC application."
 icon: "https://avatars.githubusercontent.com/u/138866112?s=200&v=4"

diff --git a/notifynl-omc/values.yaml b/notifynl-omc/values.yaml
@@ -11,7 +11,7 @@
 image:
   registry: "docker.io"
   repository: "worthnl/notifynl-omc"
-  tag: "1.6.6.1"
+  tag: "1.6.7"
   fullImage: [] # use this from pipeline, includes registry, repo and tag
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'