Fixes contious delivery

.env.example

@@ -18,8 +18,8 @@ TREASURER_NAME=
 TREASURER_PHONE=
 
 AUTHORIZE_URL=/oauth/authorize
-TOKEN_URL=/oauth/token
-ME_URL=/oauth/me
+TOKEN_URL=/api/v1/oauth/token
+ME_URL=/api/v1/users?filter[me]&include="active_groups"
 
 COMPANY_NAME=Stichting Sociëteit Flux
 COMPANY_IBAN=NL68 INGB 0008 1654 20

.github/workflows/continuous-delivery.yml

@@ -4,9 +4,15 @@ on:
   workflow_dispatch:
     inputs:
       merge:
-        description: Merge staging into master first? (y/N)
+        type: boolean
+        description: Merge staging into master first?
         required: false
-        default: 'n'
+        default: false
+      ignore_metadata_diff:
+        type: boolean
+        description: Perform all jobs, regardless of whether there are actual changes?
+        required: false
+        default: false
       target_env:
         type: choice
         description: Target environment
@@ -20,7 +26,7 @@ concurrency:
 
 env:
   PROJECT_NAME: sofia
-
+  
 jobs:
   branch_check:
     name: Branch Check
@@ -53,11 +59,11 @@ jobs:
       - name: Get metadata
         id: get_metadata
         env:
-          INPUT_MERGE: ${{ github.event.inputs.merge }}
+          INPUT_MERGE: ${{ inputs.merge }}
           TARGET_ENV: ${{ github.event.inputs.target_env }}
         run: |
           if [ "$GITHUB_REF_NAME" = 'master' ]; then
-            if [ "${INPUT_MERGE,,}" = 'y' ]; then
+            if [ "$INPUT_MERGE" = 'true' ]; then
               git fetch origin staging
               if ! git diff origin/master origin/staging --exit-code; then
                 echo 'has_diff=true' >> "$GITHUB_OUTPUT"
@@ -79,7 +85,7 @@ jobs:
     name: Merge
     runs-on: ubuntu-latest
     needs: metadata
-    if: github.event.inputs.merge == 'y'
+    if: inputs.merge
     outputs:
       sha: ${{ steps.get_sha.outputs.sha }}
     steps:
@@ -101,7 +107,7 @@ jobs:
         uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
 
       - name: Run merge
-        if: fromJSON(needs.metadata.outputs.has_diff)
+        if: fromJSON(needs.metadata.outputs.has_diff) || github.event.inputs.ignore_metadata_diff
         uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f # tag=v1.4.0
         with:
           type: now
@@ -111,25 +117,26 @@ jobs:
 
       - name: Get merge commit SHA
         id: get_sha
-        if: fromJSON(needs.metadata.outputs.has_diff)
+        if: fromJSON(needs.metadata.outputs.has_diff) || github.event.inputs.ignore_metadata_diff
         run: |
           git fetch origin master
           echo 'sha='"$(git rev-parse origin/master)" >> "$GITHUB_OUTPUT"
 
   continuous_integration:
     name: Continuous Integration
     needs: [metadata, merge]
-    if: fromJSON(needs.metadata.outputs.has_diff)
+    if: fromJSON(needs.metadata.outputs.has_diff) || github.event.inputs.ignore_metadata_diff
     uses: csvalpha/sofia/.github/workflows/continuous-integration.yml@staging
     with:
       sha: ${{ needs.merge.outputs.sha }}
     secrets:
       rails_master_key: ${{ secrets.RAILS_MASTER_KEY }}
+
 
   publish_image:
     name: Publish Image
     needs: [metadata, merge]
-    if: fromJSON(needs.metadata.outputs.has_diff)
+    if: fromJSON(needs.metadata.outputs.has_diff) || github.event.inputs.ignore_metadata_diff
     uses: csvalpha/sofia/.github/workflows/publish-image.yml@staging
     with:
       sha: ${{ needs.merge.outputs.sha }}
@@ -143,8 +150,8 @@ jobs:
     needs: [metadata, merge, continuous_integration, publish_image]
     if: |
       (github.ref_name == 'staging' || github.ref_name == 'master') && ((github.ref_name == 'master' &&
-      github.event.inputs.merge == 'y' && fromJSON(needs.metadata.outputs.has_diff) && success()) ||
-      ((github.event.inputs.merge != 'y' || !fromJSON(needs.metadata.outputs.has_diff)) && !cancelled()))
+      inputs.merge && fromJSON(needs.metadata.outputs.has_diff) || github.event.inputs.ignore_metadata_diff && success()) ||
+      ((!inputs.merge|| !fromJSON(needs.metadata.outputs.has_diff)) || github.event.inputs.ignore_metadata_diff && !cancelled()))
     steps:
       - name: Get environment URL
         id: get_url