Merge branch 'main' into michalbaumgartner/blu-5086-skip-cd-pipelines-on-depandabot-prs

Author: m1so

.github/workflows/cd.yml

@@ -29,7 +29,7 @@ concurrency:
 jobs:
   build-and-push-artifacts:
     name: Build and push artifacts for Python ${{ matrix.python_version }}
-    runs-on: ubicloud-standard-2
+    runs-on: ubuntu-latest
     # Only run for base repo, not forks or dependabot
     if: (github.event.pull_request.head.repo.full_name == github.repository || github.event_name != 'pull_request') && github.actor != 'dependabot[bot]'
     strategy:
@@ -120,7 +120,7 @@ jobs:
 
   build-and-push-artifacts-status:
     name: All artifacts pushed
-    runs-on: ubicloud-standard-2
+    runs-on: ubuntu-latest
     needs: build-and-push-artifacts
     # Only run if the build job ran (i.e., not for forks or dependabot)
     if: always() && (github.event.pull_request.head.repo.full_name == github.repository || github.event_name != 'pull_request') && github.actor != 'dependabot[bot]'
@@ -143,7 +143,7 @@ jobs:
 
   publish-python-package:
     name: Publish Python package
-    runs-on: ubicloud-standard-2
+    runs-on: ubuntu-latest
     # Only run for base repo, not forks or dependabot
     if: (github.event.pull_request.head.repo.full_name == github.repository || github.event_name != 'pull_request') && github.actor != 'dependabot[bot]'
     outputs:
@@ -282,7 +282,7 @@ jobs:
 
   publish-to-pypi:
     name: Publish to PyPI
-    runs-on: ubicloud-standard-2
+    runs-on: ubuntu-latest
     needs: publish-python-package
     # Only run for base repo when a new tag is created, not for dependabot
     if: (github.event.pull_request.head.repo.full_name == github.repository || github.event_name != 'pull_request') && startsWith(github.ref, 'refs/tags/') && github.actor != 'dependabot[bot]'
@@ -306,7 +306,7 @@ jobs:
 
   deploy-review-app:
     name: Deploy review app
-    runs-on: ubicloud-standard-2
+    runs-on: ubuntu-latest
     needs: build-and-push-artifacts-status
     # Only run for base repo PRs, not forks or dependabot
     if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]'
@@ -351,7 +351,7 @@ jobs:
 
   jupyter-for-local:
     name: Jupyter for local
-    runs-on: ubicloud-standard-2
+    runs-on: ubuntu-latest
     needs: build-and-push-artifacts-status
     # Only run for base repo, not forks or dependabot
     if: (github.event.pull_request.head.repo.full_name == github.repository || github.event_name != 'pull_request') && github.actor != 'dependabot[bot]'
@@ -409,7 +409,7 @@ jobs:
 
   build-toolkit-cluster-cache:
     name: Build toolkit cluster cache
-    runs-on: ubicloud-standard-2
+    runs-on: ubuntu-latest
     needs: build-and-push-artifacts-status
     if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')
     env:
@@ -450,7 +450,7 @@ jobs:
 
   release-staging:
     name: Release staging
-    runs-on: ubicloud-standard-2
+    runs-on: ubuntu-latest
     needs: build-toolkit-cluster-cache
     if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')
     steps:
@@ -491,7 +491,7 @@ jobs:
 
   release-production:
     name: Release production
-    runs-on: ubicloud-standard-2
+    runs-on: ubuntu-latest
     needs: build-toolkit-cluster-cache
     if: startsWith(github.ref, 'refs/tags/')
     steps:

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ env:
 jobs:
   spell-check:
     name: Spell Check
-    runs-on: ubicloud-standard-2
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
         with:
@@ -60,7 +60,7 @@ jobs:
 
   format:
     name: Format
-    runs-on: ubicloud-standard-2
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
         with:
@@ -102,7 +102,7 @@ jobs:
   license-check:
     name: License Check
     # This only checks production dependencies inclusive of the dev deps that are actually prod deps (see pyproject.toml).
-    runs-on: ubicloud-standard-2
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
         with:
@@ -158,7 +158,7 @@ jobs:
 
   mypy:
     name: Typecheck - ${{ matrix.python-version }}
-    runs-on: ubicloud-standard-2
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
@@ -216,9 +216,13 @@ jobs:
 
   gitleaks:
     name: Gitleaks check
+<<<<<<< HEAD
     runs-on: ubicloud-standard-2
     # Only run for base repo, not forks
     if: github.event.pull_request.head.repo.full_name == github.repository || github.event_name != 'pull_request'
+=======
+    runs-on: ubuntu-latest
+>>>>>>> main
     steps:
       - name: Checkout code
         uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
@@ -234,7 +238,7 @@ jobs:
 
   semgrep:
     name: Static Analysis
-    runs-on: ubicloud-standard-2
+    runs-on: ubuntu-latest
     timeout-minutes: 3
 
     env:
@@ -259,7 +263,7 @@ jobs:
 
   qlty:
     name: Qlty Check
-    runs-on: ubicloud-standard-2
+    runs-on: ubuntu-latest
     timeout-minutes: 3
 
     steps:
@@ -279,7 +283,7 @@ jobs:
 
   tests-unit:
     name: Test - Python ${{ matrix.python-version }}
-    runs-on: ubicloud-standard-2
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
@@ -395,7 +399,7 @@ jobs:
           poetry run coverage report --data-file=coverage/.coverage.${PYTHON_VERSION} --format=markdown >> $GITHUB_STEP_SUMMARY
   audit-prod:
     name: Audit - Production
-    runs-on: ubicloud-standard-2
+    runs-on: ubuntu-latest
     timeout-minutes: 3
     steps:
       - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
@@ -436,7 +440,7 @@ jobs:
 
   audit-all:
     name: Audit - All
-    runs-on: ubicloud-standard-2
+    runs-on: ubuntu-latest
     timeout-minutes: 3
     steps:
       - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4

.github/workflows/clean-up-review-app-deployment.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   close-app-config-pr:
     name: Close corresponding PR in app-config repo
-    runs-on: ubicloud-standard-2
+    runs-on: ubuntu-latest
     # Only run for internal PRs (not from forks)
     if: github.event.pull_request.head.repo.full_name == github.repository
     steps: