From c0bbe1120afeac95fb85b72316c1bf45997ba691 Mon Sep 17 00:00:00 2001 From: Pavlo Golub Date: Fri, 20 Dec 2024 14:28:09 +0100 Subject: [PATCH 1/7] [+] bump Python to v3.13.1 --- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 2 +- env.ps1 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cf84a0c..ef72544 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/setup-python@v5 with: - python-version: '3.12.5' + python-version: '3.13.1' - name: Checkout code uses: actions/checkout@v4 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 003990a..80fb103 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/setup-python@v5 with: - python-version: '3.12.5' + python-version: '3.13.1' - name: Check out code uses: actions/checkout@v4 diff --git a/env.ps1 b/env.ps1 index 3f993b3..13454ee 100644 --- a/env.ps1 +++ b/env.ps1 @@ -6,7 +6,7 @@ $MICRO_REF = "https://github.com/zyedidia/micro/releases/download/v2.0.14/micro- $WINSW_REF = "https://github.com/winsw/winsw/releases/download/v2.12.0/WinSW.NET461.exe" $VIP_REF = "https://github.com/cybertec-postgresql/vip-manager/releases/download/v2.6.0/vip-manager_2.6.0_Windows_x86_64.zip" $PGSQL_REF = "https://get.enterprisedb.com/postgresql/postgresql-16.4-1-windows-x64-binaries.zip" -$PYTHON_REF = "https://www.python.org/ftp/python/3.12.5/python-3.12.5-amd64.exe" +$PYTHON_REF = "https://www.python.org/ftp/python/3.13.1/python-3.13.1-amd64.exe" # one should change python version in github action workflows when changed here $SEVENZIP = "C:\Program Files\7-Zip\7z.exe" From 14d91ae95849f11cd9d9d877bfcb70a8a58ab04e Mon Sep 17 00:00:00 2001 From: Pavlo Golub Date: Fri, 20 Dec 2024 14:28:32 +0100 Subject: [PATCH 2/7] [+] bump etcd to v3.5.16 --- env.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/env.ps1 b/env.ps1 index 13454ee..eaf6e5e 100644 --- a/env.ps1 +++ b/env.ps1 @@ -1,6 +1,6 @@ $MD = "PES" $VCREDIST_REF = "https://aka.ms/vs/17/release/vc_redist.x64.exe" -$ETCD_REF = "https://github.com/etcd-io/etcd/releases/download/v3.5.16/etcd-v3.5.16-windows-amd64.zip" +$ETCD_REF = "https://github.com/etcd-io/etcd/releases/download/v3.5.17/etcd-v3.5.17-windows-amd64.zip" $PATRONI_REF = "https://github.com/patroni/patroni/archive/refs/tags/v4.0.2.zip" $MICRO_REF = "https://github.com/zyedidia/micro/releases/download/v2.0.14/micro-2.0.14-win64.zip" $WINSW_REF = "https://github.com/winsw/winsw/releases/download/v2.12.0/WinSW.NET461.exe" From 5d88b5322e71ec2dc6ba0ff70726bfe854f29659 Mon Sep 17 00:00:00 2001 From: Pavlo Golub Date: Fri, 20 Dec 2024 14:28:53 +0100 Subject: [PATCH 3/7] [+] bump Patroni to v4.0.4 --- env.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/env.ps1 b/env.ps1 index eaf6e5e..8941d68 100644 --- a/env.ps1 +++ b/env.ps1 @@ -1,7 +1,7 @@ $MD = "PES" $VCREDIST_REF = "https://aka.ms/vs/17/release/vc_redist.x64.exe" $ETCD_REF = "https://github.com/etcd-io/etcd/releases/download/v3.5.17/etcd-v3.5.17-windows-amd64.zip" -$PATRONI_REF = "https://github.com/patroni/patroni/archive/refs/tags/v4.0.2.zip" +$PATRONI_REF = "https://github.com/patroni/patroni/archive/refs/tags/v4.0.4.zip" $MICRO_REF = "https://github.com/zyedidia/micro/releases/download/v2.0.14/micro-2.0.14-win64.zip" $WINSW_REF = "https://github.com/winsw/winsw/releases/download/v2.12.0/WinSW.NET461.exe" $VIP_REF = "https://github.com/cybertec-postgresql/vip-manager/releases/download/v2.6.0/vip-manager_2.6.0_Windows_x86_64.zip" From 44affdf20c9418d3946c69f83091832b0eae8ecb Mon Sep 17 00:00:00 2001 From: Pavlo Golub Date: Fri, 20 Dec 2024 14:29:16 +0100 Subject: [PATCH 4/7] [+] bump vip-manager to v3.0.0 --- env.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/env.ps1 b/env.ps1 index 8941d68..36f52f0 100644 --- a/env.ps1 +++ b/env.ps1 @@ -4,7 +4,7 @@ $ETCD_REF = "https://github.com/etcd-io/etcd/releases/download/v3.5.17/etcd-v3.5 $PATRONI_REF = "https://github.com/patroni/patroni/archive/refs/tags/v4.0.4.zip" $MICRO_REF = "https://github.com/zyedidia/micro/releases/download/v2.0.14/micro-2.0.14-win64.zip" $WINSW_REF = "https://github.com/winsw/winsw/releases/download/v2.12.0/WinSW.NET461.exe" -$VIP_REF = "https://github.com/cybertec-postgresql/vip-manager/releases/download/v2.6.0/vip-manager_2.6.0_Windows_x86_64.zip" +$VIP_REF = "https://github.com/cybertec-postgresql/vip-manager/releases/download/v3.0.0/vip-manager_3.0.0_Windows_x86_64.zip" $PGSQL_REF = "https://get.enterprisedb.com/postgresql/postgresql-16.4-1-windows-x64-binaries.zip" $PYTHON_REF = "https://www.python.org/ftp/python/3.13.1/python-3.13.1-amd64.exe" # one should change python version in github action workflows when changed here From 9eab20e86280fdd1b93e42bc756cfc617e33f05a Mon Sep 17 00:00:00 2001 From: Pavlo Golub Date: Fri, 20 Dec 2024 14:29:33 +0100 Subject: [PATCH 5/7] [+] bump PostgreSQL to v17.2 --- env.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/env.ps1 b/env.ps1 index 36f52f0..3f4b6fc 100644 --- a/env.ps1 +++ b/env.ps1 @@ -5,7 +5,7 @@ $PATRONI_REF = "https://github.com/patroni/patroni/archive/refs/tags/v4.0.4.zip" $MICRO_REF = "https://github.com/zyedidia/micro/releases/download/v2.0.14/micro-2.0.14-win64.zip" $WINSW_REF = "https://github.com/winsw/winsw/releases/download/v2.12.0/WinSW.NET461.exe" $VIP_REF = "https://github.com/cybertec-postgresql/vip-manager/releases/download/v3.0.0/vip-manager_3.0.0_Windows_x86_64.zip" -$PGSQL_REF = "https://get.enterprisedb.com/postgresql/postgresql-16.4-1-windows-x64-binaries.zip" +$PGSQL_REF = "https://get.enterprisedb.com/postgresql/postgresql-17.2-1-windows-x64-binaries.zip" $PYTHON_REF = "https://www.python.org/ftp/python/3.13.1/python-3.13.1-amd64.exe" # one should change python version in github action workflows when changed here From f31375c2ee8b078cece46769327fc71acb787820 Mon Sep 17 00:00:00 2001 From: Pavlo Golub Date: Fri, 20 Dec 2024 14:41:22 +0100 Subject: [PATCH 6/7] add Ignore error action --- make.ps1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/make.ps1 b/make.ps1 index df38c68..12757f3 100644 --- a/make.ps1 +++ b/make.ps1 @@ -15,7 +15,7 @@ function Extract-ZipFile { } else { Expand-Archive -Path "$zipFilePath" -DestinationPath "$destinationPath" } - Remove-Item -Force "$zipFilePath" + Remove-Item -Force "$zipFilePath" -ErrorAction Ignore } function Compress-ToZipFile { @@ -68,7 +68,7 @@ function Get-VIPManager { Invoke-WebRequest -Uri $VIP_REF -OutFile "$env:TEMP\vip.zip" Extract-ZipFile "$env:TEMP\vip.zip" "$MD" Rename-Item "$MD\vip-manager*" "vip-manager" - Remove-Item "$MD\vip-manager\*.yml" -ErrorAction SilentlyContinue + Remove-Item "$MD\vip-manager\*.yml" -ErrorAction SilentlyContinue -ErrorAction Ignore Copy-Item "src\vip.yaml" "$MD\vip-manager" Write-Host "`n--- VIP-MANAGER downloaded ---" -ForegroundColor green } @@ -77,7 +77,7 @@ function Get-PostgreSQL { Write-Host "`n--- Download POSTGRESQL ---" -ForegroundColor blue Invoke-WebRequest -Uri $PGSQL_REF -OutFile "$env:TEMP\pgsql.zip" Extract-ZipFile "$env:TEMP\pgsql.zip" "$MD" - Remove-Item -Recurse -Force "$MD\pgsql\pgAdmin 4", "$MD\pgsql\symbols" + Remove-Item -Recurse -Force "$MD\pgsql\pgAdmin 4", "$MD\pgsql\symbols" -ErrorAction Ignore Write-Host "`n--- POSTGRESQL downloaded ---" -ForegroundColor green } @@ -86,7 +86,7 @@ function Get-Patroni { Invoke-WebRequest -Uri $PATRONI_REF -OutFile "$env:TEMP\patroni.zip" Extract-ZipFile "$env:TEMP\patroni.zip" "$MD" Rename-Item "$MD\patroni-*" "patroni" - Remove-Item "$MD\patroni\postgres?.yml" + Remove-Item "$MD\patroni\postgres?.yml" -ErrorAction Ignore Copy-Item "src\patroni.yaml" "$MD\patroni" Write-Host "`n--- PATRONI downloaded ---" -ForegroundColor green } From b097ff34dada482e27d5247ad2e77170a1e13368 Mon Sep 17 00:00:00 2001 From: Pavlo Golub Date: Fri, 20 Dec 2024 14:44:09 +0100 Subject: [PATCH 7/7] fix --- make.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make.ps1 b/make.ps1 index 12757f3..5fe4271 100644 --- a/make.ps1 +++ b/make.ps1 @@ -68,7 +68,7 @@ function Get-VIPManager { Invoke-WebRequest -Uri $VIP_REF -OutFile "$env:TEMP\vip.zip" Extract-ZipFile "$env:TEMP\vip.zip" "$MD" Rename-Item "$MD\vip-manager*" "vip-manager" - Remove-Item "$MD\vip-manager\*.yml" -ErrorAction SilentlyContinue -ErrorAction Ignore + Remove-Item "$MD\vip-manager\*.yml" -ErrorAction Ignore Copy-Item "src\vip.yaml" "$MD\vip-manager" Write-Host "`n--- VIP-MANAGER downloaded ---" -ForegroundColor green }