Merge pull request #2819 from philips-labs/develop

chore: sync develop to main

Author: npalm

Diff for: .github/dependabot.yml

@@ -26,8 +26,3 @@ updates:
     directory: "/modules/runners/lambdas/runners"
     schedule:
       interval: "weekly"
-
-  - package-ecosystem: "npm"
-    directory: "/.release"
-    schedule:
-      interval: "weekly"

Diff for: .github/workflows/lambda-runner-binaries-syncer.yml

@@ -2,7 +2,7 @@ name: Lambda Syncer
 on:
   push:
     branches:
-      - develop
+      - main
   pull_request:
     paths:
       - .github/workflows/lambda-runner-binaries-syncer.yml

Diff for: .github/workflows/lambda-runners.yml

@@ -2,7 +2,7 @@ name: Lambda Runners
 on:
   push:
     branches:
-      - develop
+      - main
   pull_request:
     paths:
       - .github/workflows/lambda-runners.yml

Diff for: .github/workflows/lambda-webhook.yml

@@ -2,7 +2,7 @@ name: Lambda Webhook
 on:
   push:
     branches:
-      - develop
+      - main
   pull_request:
     paths:
       - .github/workflows/lambda-webhook.yml

Diff for: .github/workflows/packer-build.yml

@@ -3,19 +3,18 @@ on:
   push:
     branches:
       - main
-      - develop
   pull_request:
     paths:
       - "images/**"
       - ".github/workflows/packer-build.yml"
       - "module/runners/templates/**"
 
-env:  
+env:
   AWS_REGION: eu-west-1
 
 jobs:
   verify_packer:
-    name: Verify packer    
+    name: Verify packer
     runs-on: ubuntu-latest
     container:
       image: hashicorp/packer:1.7.8
@@ -28,12 +27,12 @@ jobs:
     steps:
       - name: "Checkout"
         uses: actions/checkout@v3
-      
+
       - name: packer init
         run: packer init .
 
       - name: check packer formatting
-        run: packer fmt -recursive -check=true .        
+        run: packer fmt -recursive -check=true .
 
       - name: packer validate
         run: packer validate .

Diff for: .github/workflows/release.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - main
-      - refactor/release
+      - v1
 
 jobs:
   prepare:
@@ -41,32 +41,30 @@ jobs:
     needs:
       prepare
     outputs:
-      upload_url: ${{ steps.release.outputs.upload_url }}
       releases_created: ${{ steps.release.outputs.releases_created }}
-    permissions:
-      contents: write
-      issues: write
-      pull-requests: write
-      actions: write
+      tag_name: ${{ steps.release.outputs.tag_name }}
     steps:
       - name: Get installation token
-        uses: npalm/action-[email protected].0
+        uses: philips-software/app-token-action@v1.1.2
         id: token
         with:
-          appId: ${{ secrets.FOREST_RELEASER_APP_ID }}
-          appPrivateKeyBase64: ${{ secrets.FOREST_RELEASER_APP_PRIVATE_KEY_BASE64 }}
-          appInstallationType: repo
-          appInstallationValue: ${{ github.repository }}
+          app_id: ${{ secrets.FOREST_RELEASER_APP_ID }}
+          app_base64_private_key: ${{ secrets.FOREST_RELEASER_APP_PRIVATE_KEY_BASE64 }}
+          auth_type: installation
+
+
+      - name: Extract branch name
+        id: branch
+        shell: bash
+        run: echo "name=${GITHUB_REF#refs/heads/}" >> $GITHUB_OUTPUT
 
-      # bootstrap-sha and release-as needs to be removed after first release
       - name: Release
         id: release
         uses: google-github-actions/release-please-action@5c07f8be172b1f6e90f9c35baf8184461b91b85f # ratchet:google-github-actions/release-please-action@v3
         with:
-          default-branch: main
+          default-branch: ${{ steps.branch.outputs.name }}
           release-type: terraform-module
           token: ${{ steps.token.outputs.token }}
-          last-release-sha: b404332ff8b401a5a8958317a69b9f849b794a16
 
   assets:
     name: upload assets
@@ -81,18 +79,13 @@ jobs:
       actions: read
 
     steps:
+      - uses: actions/checkout@v3
       - uses: actions/download-artifact@v3
         with:
           name: ${{ matrix.asset }}
-          path: artifacts
 
       - name: Upload Release Asset
-        id: upload-release-asset
-        uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: artifacts/${{ matrix.asset }}.zip
-          asset_name: ${{ matrix.asset }}.zip
-          asset_content_type: application/zip
+        run:
+          gh release upload ${{ needs.release.outputs.tag_name }} ${{ matrix.asset }}.zip

Diff for: .github/workflows/terraform.yml

@@ -3,7 +3,6 @@ on:
   push:
     branches:
       - main
-      - develop
   pull_request:
     paths-ignore:
       - "modules/*/lambdas/**"