Merge branch 'robuust' into pdo_sqlsrv

# Conflicts: # .github/workflows/docker-publish.yml
robuust · Dec 8, 2023 · 48f80a6 · 48f80a6
2 parents 2e3c48c + 142d684
commit 48f80a6
Show file tree

Hide file tree

Showing 117 changed files with 2,659 additions and 6,807 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -3,11 +3,19 @@ updates:
   - package-ecosystem: "bundler"
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
+    groups:
+      test-dependencies:
+        patterns:
+        - "*"
   - package-ecosystem: "composer"
     directory: "/support/devcenter"
     schedule:
       interval: "monthly"
+    groups:
+      devcenter-generator-dependencies:
+        patterns: 
+        - "*"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,7 +36,7 @@ jobs:
       BLACKFIRE_SERVER_TOKEN: ${{ secrets.BLACKFIRE_SERVER_TOKEN }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install Ruby and Bundler
         uses: ruby/setup-ruby@v1
         with:
@@ -45,12 +45,10 @@ jobs:
       - name: Install PHP and Composer
         uses: shivammathur/setup-php@v2
         with:
-          php-version: "8.1"
-          tools: "composer:2.4"
+          php-version: "8.2"
+          tools: "composer:2.6"
       - name: Hatchet setup
-        run: |
-          bundle exec hatchet ci:setup
-          heroku update --version 8.1.9
+        run: bundle exec hatchet ci:setup
       - name: Export HEROKU_PHP_PLATFORM_REPOSITORIES to …-develop (since we are not building main or a tag)
         if: github.ref_type != 'tag' && github.ref_name != 'main'
         run: |
@@ -65,7 +63,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install Ruby and Bundler
         uses: ruby/setup-ruby@v1
         with:

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -13,13 +13,13 @@ jobs:
     if: github.event_name == 'push'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up QEMU        
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx        
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Log into GitHub Container Registry
         run: echo "${{ secrets.CR_PAT }}" | docker login https://ghcr.io -u ${{ github.actor }} --password-stdin
@@ -36,7 +36,7 @@ jobs:
 
     steps:
       - name: Set up QEMU        
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: Build & deploy ext-pdo_sqlsrv for php 8.1
         run: docker run --platform=linux/arm64 --rm -e AWS_ACCESS_KEY_ID="${{ secrets.AWS_ACCESS_KEY_ID }}" -e AWS_SECRET_ACCESS_KEY="${{ secrets.AWS_SECRET_ACCESS_KEY }}" ghcr.io/robuust/heroku-php-build-heroku-22 deploy.sh extensions/no-debug-non-zts-20210902/pdo_sqlsrv-5.11.1 --overwrite
@@ -53,10 +53,27 @@ jobs:
 
     steps:
       - name: Set up QEMU        
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: Build & deploy ext-pdo_sqlsrv for php 8.2
         run: docker run --platform=linux/arm64 --rm -e AWS_ACCESS_KEY_ID="${{ secrets.AWS_ACCESS_KEY_ID }}" -e AWS_SECRET_ACCESS_KEY="${{ secrets.AWS_SECRET_ACCESS_KEY }}" ghcr.io/robuust/heroku-php-build-heroku-22 deploy.sh extensions/no-debug-non-zts-20220829/pdo_sqlsrv-5.11.1 --overwrite
 
       - name: Build & deploy ext-pdo_sqlsrv for php 8.2 (x86)
         run: docker run --platform=linux/amd64 --rm -e AWS_ACCESS_KEY_ID="${{ secrets.AWS_ACCESS_KEY_ID }}" -e AWS_SECRET_ACCESS_KEY="${{ secrets.AWS_SECRET_ACCESS_KEY }}" ghcr.io/robuust/heroku-php-build-heroku-22 deploy.sh extensions/no-debug-non-zts-20220829/pdo_sqlsrv-5.11.1 --name=extensions/no-debug-non-zts-20220829/pdo_sqlsrv-5.11.1-x86 --overwrite
+
+  php83:
+    # Ensure push job passes before pushing image.
+    needs: push
+
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push'
+
+    steps:
+      - name: Set up QEMU        
+        uses: docker/setup-qemu-action@v3
+
+      - name: Build & deploy ext-pdo_sqlsrv for php 8.3
+        run: docker run --platform=linux/arm64 --rm -e AWS_ACCESS_KEY_ID="${{ secrets.AWS_ACCESS_KEY_ID }}" -e AWS_SECRET_ACCESS_KEY="${{ secrets.AWS_SECRET_ACCESS_KEY }}" ghcr.io/robuust/heroku-php-build-heroku-22 deploy.sh extensions/no-debug-non-zts-20230831/pdo_sqlsrv-5.11.1 --overwrite
+
+      - name: Build & deploy ext-pdo_sqlsrv for php 8.23(x86)
+        run: docker run --platform=linux/amd64 --rm -e AWS_ACCESS_KEY_ID="${{ secrets.AWS_ACCESS_KEY_ID }}" -e AWS_SECRET_ACCESS_KEY="${{ secrets.AWS_SECRET_ACCESS_KEY }}" ghcr.io/robuust/heroku-php-build-heroku-22 deploy.sh extensions/no-debug-non-zts-20230831/pdo_sqlsrv-5.11.1 --name=extensions/no-debug-non-zts-20230831/pdo_sqlsrv-5.11.1-x86 --overwrite
diff --git a/.github/workflows/platform-build.yml b/.github/workflows/platform-build.yml
@@ -46,7 +46,7 @@ jobs:
       formulae: ${{ steps.expand-formulae.outputs.matrix }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install jq tool
         run: |
           sudo apt-get update
@@ -65,7 +65,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Cache Docker build
         id: cache-docker
         uses: actions/cache@v3
@@ -91,7 +91,7 @@ jobs:
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Restore cached Docker build
         uses: actions/cache/restore@v3
         with:
@@ -117,7 +117,7 @@ jobs:
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Restore cached Docker build
         uses: actions/cache/restore@v3
         with:

diff --git a/.github/workflows/platform-remove.yml b/.github/workflows/platform-remove.yml
@@ -32,7 +32,7 @@ jobs:
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Expand list of manifests to remove
         run: |
           echo '## Manifests input for removal' >> "$GITHUB_STEP_SUMMARY"
@@ -73,7 +73,7 @@ jobs:
           (yes 2>/dev/null || true) | docker run --rm -i --env-file=support/build/_docker/env.default heroku-php-build-${{inputs.stack}}:${{github.sha}} remove.sh ${{inputs.manifests}} 2>&1 | tee remove.out
       - name: Output job summary
         run: |
-          echo '## Packages${{ inputs.dry-run == true && ' which would be' }} removed from production bucket' >> "$GITHUB_STEP_SUMMARY"
+          echo '## Packages${{ inputs.dry-run == true && ' which would be' || '' }} removed from production bucket' >> "$GITHUB_STEP_SUMMARY"
           echo "${{ inputs.dry-run == true && '**This is output from a dry-run**, no packages have been removed:' || '-n' }}" >> "$GITHUB_STEP_SUMMARY"
           echo '```' >> "$GITHUB_STEP_SUMMARY"
           sed -n '/The following packages will/,$p' remove.out >> "$GITHUB_STEP_SUMMARY"