Merge pull request #251 from JensDll/staging

github-actions: merge staging into main

.github/workflows/deploy_docker.yaml

@@ -46,9 +46,8 @@ jobs:
       - name: Building and pushing container image
         uses: docker/build-push-action@v4.0.0
         with:
-          context: services/steganography.api
-          # Build sometimes fails on ARM
-          # https://github.com/NuGet/Home/issues/12227
+          context: services
+          file: services/steganography.api/Dockerfile
           platforms: |
             linux/amd64,linux/arm64
           push: true

.github/workflows/merge_staging_main.yaml

@@ -0,0 +1,38 @@
+name: Merge staging into main
+
+on:
+  pull_request:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  create_pull_request:
+    if: github.event_name == 'workflow_dispatch'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checking out the repository
+        uses: actions/checkout@v3.5.2
+
+      - name: Creating pull request
+        uses: ./.github/actions/create_pull
+        with:
+          # Make sure to trigger pull request workflows
+          github_token: ${{ secrets.WORKFLOW_TOKEN }}
+          base: main
+          head: staging
+          title: "github-actions: merge staging into main"
+
+  merge_pull_request:
+    if: github.event_name == 'pull_request'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checking out the repository
+        uses: actions/checkout@v3.5.2
+
+      - name: Merging pull request
+        uses: ./.github/actions/merge_pull
+        with:
+          # Make sure to trigger push workflows
+          github_token: ${{ secrets.WORKFLOW_TOKEN }}
+          pull_number: ${{ github.event.number }}