pg version and matid

AndreMikulec · Aug 4, 2024 · 286c30c · 286c30c
1 parent b9ba27c
commit 286c30c
Show file tree

Hide file tree

Showing 2 changed files with 76 additions and 43 deletions.
diff --git a/.github/workflows/buildPLR.yml b/.github/workflows/buildPLR.yml
@@ -3,7 +3,7 @@ run-name: Meson Builds PL/R - ${{ github.event.head_commit.message }}
 on: [push, pull_request, workflow_dispatch]
 jobs:
   build_test_install:
-    name: R ${{ matrix.rversion }} PGsrc ${{ matrix.pgSRCversion }} PGbin ${{ matrix.pgWINversion }} ${{ matrix.compilerEnv }} ${{ matrix.Platform }}  ${{ matrix.os }} ${{ matrix.Configuration }} R ${{ matrix.rversion }} PGSRC ${{ matrix.buildpgFromSRC }} PGSRCMETH ${{ matrix.buildpgFromSRCmethod }} SRCCTB ${{ matrix.buildpgANDplrInSRCcontrib }}
+    name: R ${{ matrix.rversion }} PGsrc ${{ matrix.pgSRCversion }} PGbin ${{ matrix.pgWINversion }} ${{ matrix.compilerEnv }} ${{ matrix.Platform }}  ${{ matrix.os }} ${{ matrix.Configuration }} R ${{ matrix.rversion }} PGSRC ${{ matrix.buildpgFromSRC }} PGSRCMETH ${{ matrix.buildpgFromSRCmethod }} SRCCTB ${{ matrix.buildpgANDplrInSRCcontrib }} matid ${{ matrix.matid }}
     runs-on: ${{ matrix.os }}
     # With "continue-on-error" (and with "fail-fast") emulate Appveyor "allow_failures"
     # Prevents a workflow run from failing when a job fails. Set to true to allow a workflow run to pass when this job fails.
@@ -53,7 +53,8 @@ jobs:
           #
           # 1
           # R PGsrc PGbin cygwin x64 windows-latest Release
-          - os: windows-latest
+          - matid: 1
+            os: windows-latest
             GithubActionsIgnoreFail: false
             compilerEnv: cygwin
             Platform: x64
@@ -84,7 +85,8 @@ jobs:
           # 2
           # bleeding edge R and bleeding edge PostgreSQL
           # R devel PGsrc master PGbin UCRT64 x64 windows-latest Debug
-          - os: windows-latest
+          - matid: 2
+            os: windows-latest
             GithubActionsIgnoreFail: true
             compilerEnv: UCRT64
             shellEnv: msys2 {0}
@@ -110,7 +112,8 @@ jobs:
           # R 4.4.1 - just exists to try to determine this success . . .
           #   bleeding edge R and bleeding edge PostgreSQL
           # R 4.4.1 PGsrc master PGbin UCRT64 x64 windows-latest Debug
-          - os: windows-latest
+          - matid: 3
+            os: windows-latest
             GithubActionsIgnoreFail: true
             compilerEnv: UCRT64
             shellEnv: msys2 {0}
@@ -136,7 +139,8 @@ jobs:
           # pg REL_17_BETA2 - just exists to try to determine this success . . .
           #   bleeding edge R and bleeding edge PostgreSQL
           # R devel PGsrc REL_17_BETA2 PGbin UCRT64 x64 windows-latest Debug
-          - os: windows-latest
+          - matid: 4
+            os: windows-latest
             GithubActionsIgnoreFail: true
             compilerEnv: UCRT64
             shellEnv: msys2 {0}
@@ -162,7 +166,8 @@ jobs:
           # R pg REL_17_BETA2 R 4.4.1 - just exists to try to determine this success . . .
           #   bleeding edge R and bleeding edge PostgreSQL
           # R 4.4.1 PGsrc REL_17_BETA2 PGbin UCRT64 x64 windows-latest Debug
-          - os: windows-latest
+          - matid: 5
+            os: windows-latest
             GithubActionsIgnoreFail: true
             compilerEnv: UCRT64
             shellEnv: msys2 {0}
@@ -187,8 +192,9 @@ jobs:
 
           # 6
           # bleeding edge R and next PostgreSQL
-          - os: windows-latest
-            GithubActionsIgnoreFail: false
+          - matid: 6
+            os: windows-latest
+            GithubActionsIgnoreFail: true
             compilerEnv: UCRT64
             shellEnv: msys2 {0}
             compilerExe: gcc
@@ -223,10 +229,11 @@ jobs:
             # This may not be available if pgSRCversion is 'RC' or 'BETA'.
             # MSYS2testonpgWIN: true
 
-          # 7
+          # 7 - MYSTERY - Github Actions duplicates this job
           # R 4.4.1 and next PostgreSQL
-          - os: windows-latest
-            GithubActionsIgnoreFail: false
+          - matid: 7
+            os: windows-latest
+            GithubActionsIgnoreFail: true
             compilerEnv: UCRT64
             shellEnv: msys2 {0}
             compilerExe: gcc
@@ -265,7 +272,8 @@ jobs:
           # REL_16_3 - just exists to try to determine this failure . . .
           #   bleeding edge R and next PostgreSQL
           # R devel PGsrc REL_17_BETA2 PGbin UCRT64 x64 windows-latest Debug
-          - os: windows-latest
+          - matid: 8
+            os: windows-latest
             GithubActionsIgnoreFail: false
             compilerEnv: UCRT64
             shellEnv: msys2 {0}
@@ -301,11 +309,12 @@ jobs:
             # This may not be available if pgSRCversion is 'RC' or 'BETA'.
             MSYS2testonpgWIN: true
 
-          # 8
+          # 9
           # R 4.4.1 REL_16_3 - just exists to try to determine this failure . . .
           #   bleeding edge R and next PostgreSQL
           # R 4.4.1 PGsrc REL_17_BETA2 PGbin UCRT64 x64 windows-latest Debug
-          - os: windows-latest
+          - matid: 9
+            os: windows-latest
             GithubActionsIgnoreFail: false
             compilerEnv: UCRT64
             shellEnv: msys2 {0}
@@ -341,11 +350,12 @@ jobs:
             # This may not be available if pgSRCversion is 'RC' or 'BETA'.
             MSYS2testonpgWIN: true
 
-          # 9
+          # 10 - NEVER RUNS AS A JOB ???
           # 4.4.1 - just exists to try to determine this failure . . .
           #   bleeding edge R and next PostgreSQL
           # R devel PGsrc REL_17_BETA2 PGbin UCRT64 x64 windows-latest Debug
-          - os: windows-latest
+          - matid: 10
+            os: windows-latest
             GithubActionsIgnoreFail: false
             compilerEnv: UCRT64
             shellEnv: msys2 {0}
@@ -381,7 +391,10 @@ jobs:
             # This may not be available if pgSRCversion is 'RC' or 'BETA'.
             # MSYS2testonpgWIN: true
 
-          - os: windows-latest
+
+          # 11
+          - matid: 11
+            os: windows-latest
             GithubActionsIgnoreFail: false
             compilerEnv: UCRT64
             shellEnv: msys2 {0}
@@ -408,11 +421,13 @@ jobs:
             # PG_HOME: 'D:\PGINSTALL'
             #
             # download from EnterpriseDB - PostgreSQL for Windows
-            pgWINversion: 16.2-1
+            pgWINversion: 16.3-2
             #
             MSYS2testonpgWIN: true
 
-          - os: windows-latest
+          # 12
+          - matid: 12
+            os: windows-latest
             GithubActionsIgnoreFail: false
             compilerEnv: UCRT64
             shellEnv: msys2 {0}
@@ -424,7 +439,7 @@ jobs:
             R_HOME: 'D:\RINSTALL'
             R_ARCH: /x64
             #
-            pgSRCversion: REL_15_7
+            pgSRCversion: REL_15_STABLE
             PG_SOURCE: 'D:\PGSOURCE'
             buildpgFromSRC: true
             buildpgFromSRCmethod: make
@@ -434,7 +449,9 @@ jobs:
             #
             MSYS2testonpgWIN: true
 
-          - os: windows-latest
+          # 13
+          - matid: 13
+            os: windows-latest
             GithubActionsIgnoreFail: false
             compilerEnv: UCRT64
             shellEnv: msys2 {0}
@@ -446,7 +463,7 @@ jobs:
             R_HOME: 'D:\RINSTALL'
             R_ARCH: /x64
             #
-            pgSRCversion: REL_14_12
+            pgSRCversion: REL_14_STABLE
             PG_SOURCE: 'D:\PGSOURCE'
             buildpgFromSRC: true
             buildpgFromSRCmethod: make
@@ -465,8 +482,10 @@ jobs:
             MSYS2testonpgWIN: true
 
           # Not working in Jul 2024 (compare with BELOW "Exact same as Fall 2023")
-          - os: windows-latest
-            GithubActionsIgnoreFail: false
+          # 14
+          - matid: 14
+            os: windows-latest
+            GithubActionsIgnoreFail: true
             compilerEnv: UCRT64
             shellEnv: msys2 {0}
             compilerExe: gcc
@@ -477,7 +496,7 @@ jobs:
             R_HOME: 'D:\RINSTALL'
             R_ARCH: /x64
             #
-            pgSRCversion: REL_13_15
+            pgSRCversion: REL_13_STABLE
             PG_SOURCE: 'D:\PGSOURCE'
             buildpgFromSRC: true
             buildpgFromSRCmethod: make
@@ -488,8 +507,10 @@ jobs:
             MSYS2testonpgWIN: true
 
           # Exact same as Fall 2023
-          - os: windows-latest
-            GithubActionsIgnoreFail: false
+          # 15
+          - matid: 15
+            os: windows-latest
+            GithubActionsIgnoreFail: true
             compilerEnv: UCRT64
             shellEnv: msys2 {0}
             compilerExe: gcc
@@ -500,7 +521,7 @@ jobs:
             R_HOME: 'D:\RINSTALL'
             R_ARCH: /x64
             #
-            pgSRCversion: REL_13_13
+            pgSRCversion: REL_13_STABLE
             PG_SOURCE: 'D:\PGSOURCE'
             buildpgFromSRC: true
             buildpgFromSRCmethod: make
@@ -562,8 +583,10 @@ jobs:
 ##          MSYS2testonpgWIN: true
 
           # Exact same as Fall 2023 (but not working in Jul 2024+)
-          - os: windows-latest
-            GithubActionsIgnoreFail: false
+          # 16
+          - matid: 16
+            os: windows-latest
+            GithubActionsIgnoreFail: true
             compilerEnv: MINGW32
             shellEnv: msys2 {0}
             compilerExe: gcc
@@ -574,7 +597,7 @@ jobs:
             R_HOME: 'D:\RINSTALL'
             R_ARCH: /i386
             #
-            pgSRCversion: REL_10_23
+            pgSRCversion: REL_10_STABLE
             PG_SOURCE: 'D:\PGSOURCE'
             buildpgFromSRC: true
             buildpgFromSRCmethod: make
@@ -1614,24 +1637,24 @@ jobs:
         shell: cmd
         run: |
           echo on
-          if exist pg-artifact.7z copy pg-artifact.7z pg-${{ env.os }}-${{ env.compilerEnv }}-${{ env.Platform }}-PG${{ env.pgversion }}-${{ env.Configuration }}-R${{ env.rversion }}-PGSRC${{ env.buildpgFromSRC }}-PGSRCMETH${{ env.buildpgFromSRCmethod }}-SRCCTB${{ env.buildpgANDplrInSRCcontrib }}.7z
-          if exist pg-artifact.7z dir                 pg-${{ env.os }}-${{ env.compilerEnv }}-${{ env.Platform }}-PG${{ env.pgversion }}-${{ env.Configuration }}-R${{ env.rversion }}-PGSRC${{ env.buildpgFromSRC }}-PGSRCMETH${{ env.buildpgFromSRCmethod }}-SRCCTB${{ env.buildpgANDplrInSRCcontrib }}.7z
+          if exist pg-artifact.7z copy pg-artifact.7z pg-${{ env.os }}-${{ env.compilerEnv }}-${{ env.Platform }}-PG${{ env.pgversion }}-${{ env.Configuration }}-R${{ env.rversion }}-PGSRC${{ env.buildpgFromSRC }}-PGSRCMETH${{ env.buildpgFromSRCmethod }}-SRCCTB${{ env.buildpgANDplrInSRCcontrib }}-matid-${{ matrix.matid }}.7z
+          if exist pg-artifact.7z dir                 pg-${{ env.os }}-${{ env.compilerEnv }}-${{ env.Platform }}-PG${{ env.pgversion }}-${{ env.Configuration }}-R${{ env.rversion }}-PGSRC${{ env.buildpgFromSRC }}-PGSRCMETH${{ env.buildpgFromSRCmethod }}-SRCCTB${{ env.buildpgANDplrInSRCcontrib }}-matid-${{ matrix.matid }}.7z
 
       ## temporaryily keep at v3
       # actions/upload-artifact@v3
       # is scheduled for deprecation on November 30, 2024
-      # @v4 - Due to how Artifacts are created in this new version, 
-      # it is no longer possible to upload to the same named Artifact multiple times. 
+      # @v4 - Due to how Artifacts are created in this new version,
+      # it is no longer possible to upload to the same named Artifact multiple times.
       # MAY 2024
       # github.com/actions/upload-artifact
       #
       - name: Upload artifact PG for export for LOCAL testing
         if: ${{ env.os == 'windows-latest' &&  env.compilerClass == 'MSYS2' && env.buildpgFromSRC == 'true' }}
         uses: actions/upload-artifact@v3
         with:
-          name: pg-${{ env.os }}-${{ env.compilerEnv }}-${{ env.Platform }}-PG${{ env.pgversion }}-${{ env.Configuration }}-R${{ env.rversion }}-PGSRC${{ env.buildpgFromSRC }}-PGSRCMETH${{ env.buildpgFromSRCmethod }}-SRCCTB${{ env.buildpgANDplrInSRCcontrib }}
+          name: pg-${{ env.os }}-${{ env.compilerEnv }}-${{ env.Platform }}-PG${{ env.pgversion }}-${{ env.Configuration }}-R${{ env.rversion }}-PGSRC${{ env.buildpgFromSRC }}-PGSRCMETH${{ env.buildpgFromSRCmethod }}-SRCCTB${{ env.buildpgANDplrInSRCcontrib }}-matid-${{ matrix.matid }}
           path: |
-            pg-${{ env.os }}-${{ env.compilerEnv }}-${{ env.Platform }}-PG${{ env.pgversion }}-${{ env.Configuration }}-R${{ env.rversion }}-PGSRC${{ env.buildpgFromSRC }}-PGSRCMETH${{ env.buildpgFromSRCmethod }}-SRCCTB${{ env.buildpgANDplrInSRCcontrib }}.7z
+            pg-${{ env.os }}-${{ env.compilerEnv }}-${{ env.Platform }}-PG${{ env.pgversion }}-${{ env.Configuration }}-R${{ env.rversion }}-PGSRC${{ env.buildpgFromSRC }}-PGSRCMETH${{ env.buildpgFromSRCmethod }}-SRCCTB${{ env.buildpgANDplrInSRCcontrib }}-matid-${{ matrix.matid }}.7z
 
       - name: Windows non-msvc Meson PG and Meson PL/R Setup Compile and Meson Test
         if: ${{ env.os == 'windows-latest' && ( env.compilerClass == 'MSYS2' || env.compilerClass == 'cygwin' ) && env.buildpgANDplrInSRCcontrib == 'true' }}
@@ -2721,11 +2744,19 @@ jobs:
             Write-Error 'PGVER2 is missing. Please supply the PGVER2.' -ErrorAction Stop
           }
 
+      ## temporaryily keep at v3
+      # actions/upload-artifact@v3
+      # is scheduled for deprecation on November 30, 2024
+      # @v4 - Due to how Artifacts are created in this new version,
+      # it is no longer possible to upload to the same named Artifact multiple times.
+      # MAY 2024
+      # github.com/actions/upload-artifact
+      #
       - name: Try to Upload artifacts plr.dll and plr.dll.a for export for LOCAL testing
         if: ${{ always() }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: plr-${{ env.HEAD8_GITHUB_SHA }}-${{ env.os }}-${{ env.compilerEnv }}-${{ env.Platform }}-R${{ env.rversion }}-PG${{ env.pgversion }}-${{ env.Configuration }}
+          name: plr-${{ env.HEAD8_GITHUB_SHA }}-${{ env.os }}-${{ env.compilerEnv }}-${{ env.Platform }}-R${{ env.rversion }}-PG${{ env.pgversion }}-${{ env.Configuration }}-matid-${{ matrix.matid }}
           # default
           if-no-files-found: warn
           path: |

diff --git a/appveyor.yml b/appveyor.yml
@@ -135,7 +135,7 @@ environment:
     # msvc/msys2? - "pg" 10     - last version "pg" supports x86
     # msvc/msys2? - "r"   4.1.3 - last version "r"  supports x86
 
-  - pg: REL_10_23 # static commit - from git
+  - pg: REL_10_STABLE # static commit - from git
     PlatformToolset: v143
     Configuration: Debug
     Platform: x86
@@ -157,7 +157,7 @@ environment:
     rversion: 4.1.3
     compiler: msvc
 
-  - pg: REL_10_23 # verify can compile pgsql.sln on msvc 2015
+  - pg: REL_10_STABLE # verify can compile pgsql.sln on msvc 2015
     PlatformToolset: v120
     Configuration: Debug
     Platform: x86
@@ -169,7 +169,9 @@ environment:
 #   # msvc
 
 # In Jul 2024 Appveyor msvc - REL_17 [and master] attempted builds do not build
-#  cannot open file 'C:/projects/postgresql/src/tools/msvc/Mkvcbuild.pm': No such file or directory
+# cannot open file 'C:/projects/postgresql/src/tools/msvc/Mkvcbuild.pm': No such file or directory
+# msvc(non-meson pure-msvc) builds of pg "17+ and "master" are no longer possible
+#
 #
 # - pg: master # non-static commit - from git
 #   PlatformToolset: v143
@@ -235,7 +237,7 @@ environment:
     rversion: 4.2.3
     compiler: msvc
 
-  - pg: REL_11_22 # verify can compile pgsql.sln on msvc 2017
+  - pg: REL_11_STABLE # verify can compile pgsql.sln on msvc 2017
     PlatformToolset: v140
     Configuration: Debug
     Platform: x64