Merge branch 'timescale:main' into main

sectheops · Feb 1, 2024 · 3471aa3 · 3471aa3
2 parents b2bb9eb + 3296084
commit 3471aa3
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 17 deletions.
diff --git a/.github/workflows/abi.yaml b/.github/workflows/abi.yaml
@@ -38,46 +38,46 @@ jobs:
       run: python .github/gh_config_reader.py
 
   abi_test:
-    name: ABI Test PG${{ matrix.test }}
+    name: ABI Test ${{ matrix.dir }} PG${{ matrix.pg }}
     runs-on: ubuntu-latest
     needs: config
     strategy:
       fail-fast: false
       matrix:
-        test: [ "13backward", "13forward", "14backward", "14forward",
-          "15backward", "15forward", "16backward", "16forward" ]
+        dir: [ "forward", "backward" ]
+        pg: [ 13, 14, 15 ]
         os: [ windows-2019 ]
         include:
-          - test: 13backward
+          - dir: backward
             pg: 13
             builder: ${{ fromJson(needs.config.outputs.pg13_latest) }}-alpine3.18
             tester: ${{ fromJson(needs.config.outputs.pg13_abi_min ) }}-alpine
-          - test: 13forward
+          - dir: forward
             pg: 13
             builder: ${{ fromJson(needs.config.outputs.pg13_abi_min ) }}-alpine
             tester: ${{ fromJson(needs.config.outputs.pg13_latest) }}-alpine3.18
-          - test: 14backward
+          - dir: backward
             pg: 14
             builder: ${{ fromJson(needs.config.outputs.pg14_latest) }}-alpine3.18
             tester: ${{ fromJson(needs.config.outputs.pg14_abi_min) }}-alpine
             ignores: memoize
-          - test: 14forward
+          - dir: forward
             pg: 14
             builder: ${{ fromJson(needs.config.outputs.pg14_abi_min) }}-alpine
             tester: ${{ fromJson(needs.config.outputs.pg14_latest) }}-alpine3.18
-          - test: 15backward
+          - dir: backward
             pg: 15
             builder: ${{ fromJson(needs.config.outputs.pg15_latest) }}-alpine3.18
             tester: ${{ fromJson(needs.config.outputs.pg15_abi_min) }}-alpine
-          - test: 15forward
+          - dir: forward
             pg: 15
             builder: ${{ fromJson(needs.config.outputs.pg15_abi_min) }}-alpine
             tester: ${{ fromJson(needs.config.outputs.pg15_latest) }}-alpine3.18
-          - test: 16backward
+          - dir: backward
             pg: 16
             builder: ${{ fromJson(needs.config.outputs.pg16_latest) }}-alpine3.18
             tester: ${{ fromJson(needs.config.outputs.pg16_abi_min) }}-alpine
-          - test: 16forward
+          - dir: forward
             pg: 16
             builder: ${{ fromJson(needs.config.outputs.pg16_abi_min) }}-alpine
             tester: ${{ fromJson(needs.config.outputs.pg16_latest) }}-alpine3.18
@@ -144,13 +144,13 @@ jobs:
       if: always() && steps.collectlogs.outputs.regression_diff == 'true'
       uses: actions/upload-artifact@v4
       with:
-        name: Regression diff ABI Breakage ${{ matrix.type }} PG${{ matrix.pg }}
+        name: Regression diff ABI Breakage ${{ matrix.dir }} PG${{ matrix.pg }}
         path: regression.log
 
     - name: Save postmaster.log
       if: always()
       uses: actions/upload-artifact@v4
       with:
-        name: PostgreSQL log ABI Breakage ${{ matrix.type }} PG${{ matrix.pg }}
+        name: PostgreSQL log ABI Breakage ${{ matrix.dir }} PG${{ matrix.pg }}
         path: postgres.log
 
diff --git a/.github/workflows/pr-handling.yaml b/.github/workflows/pr-handling.yaml
@@ -19,7 +19,7 @@ jobs:
     name: Assign PR to author
     runs-on: ubuntu-latest
     steps:
-      - uses: toshimaru/[email protected]
+      - uses: toshimaru/[email protected].0
 
   ask-review:
     name: Run pull-review

diff --git a/.github/workflows/rpm-packages.yaml b/.github/workflows/rpm-packages.yaml
@@ -23,9 +23,14 @@ jobs:
         image: [ "centos:centos7", "rockylinux:8", "rockylinux:9" ]
         pg: [ 13, 14, 15, 16 ]
         license: [ "TSL", "Apache"]
+        checkout: [ "v4" ]
         include:
           - license: Apache
             pkg_suffix: "-oss"
+          # centos7 does not have the right versions to support
+          # node20. See https://github.com/actions/runner/issues/2906
+          - image: "centos:centos7"
+            checkout: "v3"
         exclude:
           # PG 16 is not available on centos7
           - image: centos:centos7
@@ -72,7 +77,7 @@ jobs:
       run: |
         rpm -ql timescaledb-2${{ matrix.pkg_suffix }}-postgresql-${{ matrix.pg }}
 
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@${{ matrix.checkout }}
 
     - name: Read versions
       id: versions

diff --git a/.github/workflows/windows-build-and-test.yaml b/.github/workflows/windows-build-and-test.yaml
@@ -227,7 +227,7 @@ jobs:
       if: always() && steps.collectlogs.outputs.regression_diff == 'true'
       uses: actions/upload-artifact@v4
       with:
-        name: Regression diff ${{ matrix.os }} ${{ matrix.name }} ${{ matrix.pg }}
+        name: Regression ${{ matrix.pg }} diff ${{ matrix.os }} ${{ matrix.build_type }} Build
         path: |
           regression.log
           installcheck.log
@@ -236,7 +236,7 @@ jobs:
       if: always()
       uses: actions/upload-artifact@v4
       with:
-        name: PostgreSQL log ${{ matrix.os }} ${{ matrix.name }} ${{ matrix.pg }}
+        name: PostgreSQL ${{ matrix.pg }} log ${{ matrix.os }} ${{ matrix.build_type }} Build
         path: postgres.log
 
     - name: Upload test results to the database