fix: merge conflicts

.github/workflows/build-push-containers-all.yml

@@ -7,14 +7,29 @@ on:
       - labeled
       - opened
       - synchronize
+
   push:
     branches:
-      - '**' 
+      - main
     tags:
       - '[0-9]*.[0-9]*.[0-9]*'
 
 jobs:
+
+  read-github-context-object:
+    runs-on: ubuntu-latest
+    steps:
+      # I know this is not pretty (debug information) but it's useful to have this
+    - name: Read github context
+      env: 
+        GITHUB_CONTEXT: ${{ toJson(github) }}
+      run: |
+        echo "GITHUB_SHA=${GITHUB_SHA}"
+        echo "INFO: github context object content below"
+        echo "${GITHUB_CONTEXT}"
+
   build-push-checked-containers:
+    if: contains(github.event.pull_request.labels.*.name, 'cicd:movement-containers') ||  github.ref == 'refs/heads/main' || github.event.label.name == 'cicd:movement-containers'
     uses: ./.github/workflows/build-push-container.yml
     name: Build Push Checked Containers
     secrets: inherit
@@ -36,6 +51,7 @@ jobs:
       container_name: ${{ matrix.container_name }}
 
   build-push-checked-manifest:
+    if: contains(github.event.pull_request.labels.*.name, 'cicd:movement-containers') ||  github.ref == 'refs/heads/main' || github.event.label.name == 'cicd:movement-containers'
     uses: ./.github/workflows/build-push-manifest.yml
     name: Build Push Checked Manifest
     needs: 
@@ -60,7 +76,7 @@ jobs:
 
   container-checks:
     if: contains(github.event.pull_request.labels.*.name, 'cicd:movement-containers') ||  github.ref == 'refs/heads/main' || github.event.label.name == 'cicd:movement-containers'
-    runs-on: buildjet-8vcpu-ubuntu-2204
+    runs-on: buildjet-16vcpu-ubuntu-2204
     needs: 
       - build-push-checked-manifest
     steps:
@@ -110,6 +126,8 @@ jobs:
 ### Unchecked containers
 
   build-push-unchecked-containers:
+    if: contains(github.event.pull_request.labels.*.name, 'cicd:bridge-containers') ||  github.ref == 'refs/heads/main' || github.event.label.name == 'cicd:bridge-containers'
+
     uses: ./.github/workflows/build-push-container.yml
     name: Build Push Unchecked Containers
     secrets: inherit

.github/workflows/checks-all.yml

@@ -8,24 +8,39 @@ on:
       - synchronize
   push:
     branches:
-      - '**' 
+      - main
+    tags:
+      - '[0-9]*.[0-9]*.[0-9]*'
 
 jobs:
-
+
+  read-github-context-object:
+    runs-on: ubuntu-latest
+    steps:
+      # I know this is not pretty (debug information) but it's useful to have this
+    - name: Read github context
+      env: 
+        GITHUB_CONTEXT: ${{ toJson(github) }}
+      run: |
+        echo "GITHUB_SHA=${GITHUB_SHA}"
+        echo "INFO: github context object content below"
+        echo "${GITHUB_CONTEXT}"
+
   build:
     strategy:
       matrix:
         include:
           - os: ubuntu-22.04
             arch: x86_64
-            runs-on: buildjet-8vcpu-ubuntu-2204
-          - os: macos-13-latest
+            runs-on: buildjet-16vcpu-ubuntu-2204
+          - os: macos-15
             arch: arm64
-            runs-on: macos-13-xlarge
+            runs-on: macos-15
 
     runs-on: ${{ matrix.runs-on }}
 
     steps:
+
     - name: Checkout repository
       uses: actions/checkout@v4
 
@@ -42,10 +57,10 @@ jobs:
         include:
           - os: ubuntu-22.04
             arch: x86_64
-            runs-on: buildjet-8vcpu-ubuntu-2204
-          - os: macos-13-latest
+            runs-on: buildjet-16vcpu-ubuntu-2204
+          - os: macos-15
             arch: arm64
-            runs-on: macos-13-xlarge
+            runs-on: macos-15
 
     runs-on: ${{ matrix.runs-on }}
 
@@ -183,7 +198,7 @@ jobs:
         include:
           - os: ubuntu-22.04
             arch: x86_64
-            runs-on: buildjet-8vcpu-ubuntu-2204
+            runs-on: buildjet-16vcpu-ubuntu-2204
 
     runs-on: ${{ matrix.runs-on }}
 
@@ -239,7 +254,7 @@ jobs:
         include:
           - os: ubuntu-22.04
             arch: x86_64
-            runs-on: buildjet-8vcpu-ubuntu-2204
+            runs-on: buildjet-16vcpu-ubuntu-2204
 
     runs-on: ${{ matrix.runs-on }}
 
@@ -317,7 +332,7 @@ jobs:
         include:
           - os: ubuntu-22.04
             arch: x86_64
-            runs-on: buildjet-8vcpu-ubuntu-2204
+            runs-on: buildjet-16vcpu-ubuntu-2204
 
     runs-on: ${{ matrix.runs-on }}
 
@@ -372,7 +387,7 @@ jobs:
         include:
           - os: ubuntu-22.04
             arch: x86_64
-            runs-on: buildjet-8vcpu-ubuntu-2204
+            runs-on: buildjet-16vcpu-ubuntu-2204
 
     runs-on: ${{ matrix.runs-on }}
 
@@ -444,7 +459,7 @@ jobs:
 #        include:
 #          - os: ubuntu-22.04
 #            arch: x86_64
-#            runs-on: buildjet-8vcpu-ubuntu-2204
+#            runs-on: buildjet-16vcpu-ubuntu-2204
 #
 #    runs-on: ${{ matrix.runs-on }}
 #