Merge branch 'main' of https://github.com/Sudwest-Fryslan/Webformulie…

…renVerwerker
Sudwest-Fryslan · Aug 1, 2024 · a723d29 · a723d29
2 parents 96aed63 + b68a1d5
commit a723d29
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 40 deletions.
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -11,35 +11,36 @@ on:
 jobs:
   analyze-commits:
     runs-on: ubuntu-latest
-    outputs:
-      version-next: ${{ steps.next-version.outputs.release-version }}
-      version-next-tag: ${{ steps.next-version.outputs.release-tag }}
-      version-next-type: ${{ steps.next-version.outputs.release-type }}
     steps:
-      - uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
-        with:
-          disable-sudo: true
-          egress-policy: audit
-          allowed-endpoints: >
-            github.com:443
-  
-      - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #4.1.1
-
-      - name: Setup Node
-        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 #4.0.2
-        with:
-          node-version: 20
-
-      - name: Install dependencies
-        run: yarn global add semantic-release @semantic-release/changelog @semantic-release/git @semantic-release/github @semantic-release/exec @semantic-release/release-notes-generator @semantic-release/commit-analyzer conventional-changelog-conventionalcommits
-
-      - name: Get next version
-        id: next-version
-        run: semantic-release --dryRun
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    -
+      name: Echo DOCKER_IMAGE_REPOSITORY
+      run: "echo DOCKER_IMAGE_REPOSITORY: '${{ vars.DOCKER_IMAGE_REPOSITORY }}'"
+    - 
+      name: Checkout
+      uses: actions/checkout@v3
+      with: 
+        token: ${{ secrets.GITHUB_TOKEN }}
+    - 
+      name: "🔧 setup node"
+      uses: actions/setup-node@v2.1.5
+      with:
+        node-version: 20.x
+    -
+      name: "Install plugin for semantic-release"
+      run: npm install @google/semantic-release-replace-plugin -D
+    - 
+      name: Install dependencies
+      run: yarn global add semantic-release @semantic-release/changelog @semantic-release/git @semantic-release/github @semantic-release/exec @semantic-release/release-notes-generator @semantic-release/commit-analyzer conventional-changelog-conventionalcommits
+    -
+      name: Get next version
+      id: next-version
+      run: semantic-release --dryRun
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    outputs:
+      release-tag: ${{ steps.next-version.outputs.release-tag }}
+      release-version: ${{ steps.next-version.outputs.release-version }}
 
   docker:
     uses: ./.github/workflows/docker-build-and-push-workflow.yml
@@ -81,13 +82,13 @@ jobs:
         node-version: 20.x
     - 
       name: Install dependencies
-      run: yarn global add semantic-release @semantic-release/changelog @semantic-release/git @semantic-release/github @semantic-release/exec @semantic-release/release-notes-generator @semantic-release/commit-analyzer@10.0.1 conventional-changelog-conventionalcommits@6.1.0
+      run: yarn global add semantic-release @semantic-release/changelog @semantic-release/git @semantic-release/github @semantic-release/exec @semantic-release/release-notes-generator @semantic-release/commit-analyzer conventional-changelog-conventionalcommits
     -
       name: Semantic Release
-      run: semantic-release
+      run: "semantic-release"
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        GH_TOKEN: ${{ secrets.GITHUB_TOKEN  }}
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     -
       name: Pull commit that holds the newly created tag - if applicable
       run: git pull origin main

diff --git a/.releaserc b/.releaserc
@@ -18,7 +18,7 @@
           {"type": "test", "release": "patch"},
           {"type": "build", "release": "patch"},
           {"type": "ci", "release": "patch"},
-          {"type": "chore", "release": patch}
+          {"type": "chore", "release": "patch"}
         ],
         "parserOpts": {
           "noteKeywords": [
@@ -40,6 +40,9 @@
             "BREAKING"
           ]
         },
+        "overrides": {
+           "conventional-changelog-conventionalcommits": ">= 8.0.0"
+        },
         "writerOpts": {
           "commitsSort": ["subject", "scope"]
         },
@@ -62,7 +65,7 @@
     ],
     [
       "@semantic-release/exec", {
-        "verifyReleaseCmd": "echo \"release-tag=v${nextRelease.version}\" >> $GITHUB_OUTPUT; echo \"release-version=${nextRelease.version}\" >> $GITHUB_OUTPUT; echo \"release-type=${nextRelease.type}\" >> $GITHUB_OUTPUT"
+        "verifyReleaseCmd": "echo '::set-output name=release-tag::v${nextRelease.version}'; echo '::set-output name=release-version::${nextRelease.version}'"
       }
     ],
     [
@@ -86,4 +89,4 @@
     ],
     "@semantic-release/github"
   ]
-}
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,26 @@
 [![conventional commits](https://img.shields.io/badge/conventional%20commits-1.0.0-yellow.svg)](https://conventionalcommits.org) [![semantic versioning](https://img.shields.io/badge/semantic%20versioning-2.0.0-green.svg)](https://semver.org)
 
+## [6.16.0](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.15.4...v6.16.0) (2024-08-01)
+
+### 🍕 Features
+
+* add dossier compatibility ([f4050ec](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/f4050ecce63d10649852c2d74af9be7907c68e75))
+
+### 🐛 Bug Fixes
+
+* prevent incorrect data source ([d87c748](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/d87c748aa88fa490ce26fe7735dd1c973b0ac318))
+
+### 🧑‍💻 Code Refactoring
+
+* add clarifying comment ([bb50b6c](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/bb50b6c83a21883dcd374119b2503b091e033185))
+* remove dossiercode from CreateMetaDocument ([f466b54](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/f466b54f43881ce6b80cfbad643b5d7a2abed19c))
+
+### 🔁 Continuous Integration
+
+* add conventionalcommits override ([1ff4129](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/1ff4129b2e5cb97794432adf3c7ccc85a90bfb45))
+* remove more version locks ([7e06050](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/7e06050c44219b5e16937e1271a60ceeb0319e55))
+* remove version specification for dependencies ([e111e4f](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/commit/e111e4fe18fc654967a96e79fa5630e28c0f94dd))
+
 ## [6.15.3](https://github.com/Sudwest-Fryslan/WebformulierenVerwerker/compare/v6.15.2...v6.15.3) (2024-03-29)
 
 

diff --git a/classes/BuildInfo.properties b/classes/BuildInfo.properties
@@ -1,2 +1,2 @@
-instance.version=6.15.3
-versionDate_ddmmyyyy=29/03/2024
+instance.version=6.16.0
+versionDate_ddmmyyyy=01/08/2024
diff --git a/configurations/WebformulierenVerwerker/BuildInfo.properties b/configurations/WebformulierenVerwerker/BuildInfo.properties
@@ -1,2 +1,2 @@
-configuration.version=6.15.3
-configuration.timestamp=20240329-083849
+configuration.version=6.16.0
+configuration.timestamp=20240801-130017
diff --git a/publiccode.yaml b/publiccode.yaml
@@ -2,8 +2,8 @@ publiccodeYmlVersion: "0.2"
 # Instructies: https://github.com/OpenCatalogi/OpenCatalogiBundle/blob/main/docs/Publiccode.md
 name: WebformulierenVerwerker
 url: "https://github.com/Sudwest-Fryslan/WebformulierenVerwerker.git"
-softwareVersion: "6.15.3"    # Optional
-releaseDate: 2024-03-29
+softwareVersion: "6.16.0"    # Optional
+releaseDate: 2024-08-01
 applicationSuite: het-integratie-platform
 platforms:
   - frankframework