Bump {upload,download}-artifact actions to v4 (#6853)

Gets rid of the pesky NodeJS deprecation warning
geldata · Feb 16, 2024 · 8ab893f · 8ab893f
1 parent 2c36f6e
commit 8ab893f
Show file tree

Hide file tree

Showing 13 changed files with 404 additions and 390 deletions.
diff --git a/.github/workflows.src/build.inc.yml b/.github/workflows.src/build.inc.yml
@@ -108,7 +108,7 @@
         <%- endif %>
         METAPKG_GIT_CACHE: disabled
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: builds-<< tgt.name >>
         path: artifacts/<< plat_id >>
@@ -177,7 +177,7 @@
       run: |
         edgedb-pkg/integration/macos/build.sh
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: builds-<< tgt.name >>
         path: artifacts/<< plat_id >>
@@ -191,7 +191,7 @@
     runs-on: << tgt.runs_on if tgt.runs_on else "ubuntu-latest" >>
 
     steps:
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: builds-<< tgt.name >>
         path: artifacts/<< plat_id >>
@@ -224,7 +224,7 @@
         ref: master
         path: edgedb-pkg
 
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: builds-<< tgt.name >>
         path: artifacts/<< plat_id >>
@@ -260,7 +260,7 @@
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: builds-<< tgt.name >>
         path: artifacts/<< plat_id >>
@@ -284,7 +284,7 @@
     runs-on: << tgt.runs_on if tgt.runs_on else "ubuntu-latest" >>
 
     steps:
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: builds-<< tgt.name >>
         path: artifacts/<< plat_id >>
@@ -326,7 +326,7 @@
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: builds-<< tgt.name >>
         path: artifacts/<< plat_id >>

diff --git a/.github/workflows.src/tests-managed-pg.tpl.yml b/.github/workflows.src/tests-managed-pg.tpl.yml
@@ -61,7 +61,7 @@ jobs:
 
       - name: Store Terraform state
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: aws-rds-tfstate
           path: .github/aws-rds/terraform.tfstate
@@ -100,7 +100,7 @@ jobs:
       << setup_aws_creds()|indent(2) >>
 
       - name: Restore Terraform state
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: aws-rds-tfstate
           path: .github/aws-rds
@@ -112,7 +112,7 @@ jobs:
           TF_VAR_password: ${{ secrets.AWS_RDS_PASSWORD }}
 
       - name: Overwrite Terraform state
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: aws-rds-tfstate
           path: .github/aws-rds/terraform.tfstate
@@ -135,7 +135,7 @@ jobs:
 
       - name: Store Terraform state
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: do-database-tfstate
           path: .github/do-database/terraform.tfstate
@@ -155,7 +155,7 @@ jobs:
       run: terraform init
 
     - name: Restore Terraform state
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: do-database-tfstate
         path: .github/do-database
@@ -210,7 +210,7 @@ jobs:
       << setup_terraform()|indent(2) >>
 
       - name: Restore Terraform state
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: do-database-tfstate
           path: .github/do-database
@@ -221,7 +221,7 @@ jobs:
           TF_VAR_do_token: ${{ secrets.DIGITALOCEAN_TOKEN }}
 
       - name: Overwrite Terraform state
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: do-database-tfstate
           path: .github/do-database/terraform.tfstate
@@ -248,7 +248,7 @@ jobs:
 
       - name: Store Terraform state
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: gcp-cloud-sql-tfstate
           path: .github/gcp-cloud-sql/terraform.tfstate
@@ -287,7 +287,7 @@ jobs:
       << setup_gcp_creds()|indent(2) >>
 
       - name: Restore Terraform state
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: gcp-cloud-sql-tfstate
           path: .github/gcp-cloud-sql
@@ -298,7 +298,7 @@ jobs:
           TF_VAR_password: ${{ secrets.AWS_RDS_PASSWORD }}
 
       - name: Overwrite Terraform state
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: gcp-cloud-sql-tfstate
           path: .github/gcp-cloud-sql/terraform.tfstate
@@ -327,7 +327,7 @@ jobs:
 
       - name: Store Terraform state
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: aws-aurora-tfstate
           path: .github/aws-aurora/terraform.tfstate
@@ -366,7 +366,7 @@ jobs:
       << setup_aws_creds()|indent(2) >>
 
       - name: Restore Terraform state
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: aws-aurora-tfstate
           path: .github/aws-aurora
@@ -379,7 +379,7 @@ jobs:
           TF_VAR_vpc_id: ${{ secrets.AWS_VPC_ID }}
 
       - name: Overwrite Terraform state
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: aws-aurora-tfstate
           path: .github/aws-aurora/terraform.tfstate
@@ -403,7 +403,7 @@ jobs:
 
       - name: Store Terraform state
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: heroku-postgres-tfstate
           path: .github/heroku-postgres/terraform.tfstate
@@ -423,7 +423,7 @@ jobs:
       run: terraform init
 
     - name: Restore Terraform state
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: heroku-postgres-tfstate
         path: .github/heroku-postgres
@@ -457,7 +457,7 @@ jobs:
       << setup_aws_creds()|indent(2) >>
 
       - name: Restore Terraform state
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: heroku-postgres-tfstate
           path: .github/heroku-postgres
@@ -469,7 +469,7 @@ jobs:
           HEROKU_EMAIL: ${{ secrets.HEROKU_EMAIL }}
 
       - name: Overwrite Terraform state
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: heroku-postgres-tfstate
           path: .github/heroku-postgres/terraform.tfstate

diff --git a/.github/workflows.src/tests.inc.yml b/.github/workflows.src/tests.inc.yml
@@ -49,7 +49,7 @@
     << caller() >>
 
     - name: Upload shared artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: shared-artifacts
         path: .tmp
@@ -317,7 +317,7 @@
     - name: Download shared artifacts
       uses: Wandalen/wretry.action@a163f62ae554a8f3cbe27b23db15b60c0ae2e93c  # v1.3.0
       with:
-        action: actions/download-artifact@v3
+        action: actions/download-artifact@v4
         with: |
           name: shared-artifacts
           path: .tmp

diff --git a/.github/workflows.src/tests.tpl.yml b/.github/workflows.src/tests.tpl.yml
@@ -64,7 +64,7 @@ jobs:
         exit 1
 
     - name: Download cache key
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: shared-artifacts
         path: .tmp
@@ -102,10 +102,10 @@ jobs:
       fail-fast: false
       matrix:
         shard: [
-             1/16,  2/16,  3/16,  4/16,
-             5/16,  6/16,  7/16,  8/16,
-             9/16, 10/16, 11/16, 12/16,
-            13/16, 14/16, 15/16, 16/16,
+           1,  2,  3,  4,
+           5,  6,  7,  8,
+           9, 10, 11, 12,
+          13, 14, 15, 16,
         ]
 
     steps:
@@ -118,13 +118,13 @@ jobs:
         SHARD: ${{ matrix.shard }}
       run: |
         mkdir -p .results/
-        cp .tmp/time_stats.csv .results/shard_${SHARD/\//_}.csv
-        edb test -j2 -v -s ${SHARD} --running-times-log=.results/shard_${SHARD/\//_}.csv
+        cp .tmp/time_stats.csv .results/shard_${SHARD}.csv
+        edb test -j2 -v -s ${SHARD}/16 --running-times-log=.results/shard_${SHARD}.csv
 
     - name: Upload test results
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: python-test-results
+        name: python-test-results-${{ matrix.shard }}
         path: .results
         retention-days: 1
 
@@ -142,10 +142,10 @@ jobs:
       run: |
         edb test --list > .tmp/all_tests.txt
 
-    - name: Update shared artifacts
-      uses: actions/upload-artifact@v3
+    - name: Upload list of tests
+      uses: actions/upload-artifact@v4
       with:
-        name: shared-artifacts
+        name: test-list
         path: .tmp
         retention-days: 1
 
@@ -163,15 +163,22 @@ jobs:
           python -m pip install requests
 
       - name: Download shared artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: shared-artifacts
           path: .tmp
 
+      - name: Download test list
+        uses: actions/download-artifact@v4
+        with:
+          name: test-list
+          path: .tmp
+
       - name: Download python-test results
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: python-test-results
+          pattern: python-test-results-*
+          merge-multiple: true
           path: .results
 
       - name: Merge stats and verify tests completion