From 80475f97ebb5a76d40e6debd3e459b6ff62e4c6e Mon Sep 17 00:00:00 2001 From: zw_yan Date: Mon, 27 Jan 2025 16:31:38 +0900 Subject: [PATCH 1/2] Update support version and copyright for pg17 --- COPYRIGHT | 4 ++-- backup.c | 2 +- catalog.c | 2 +- data.c | 2 +- delete.c | 2 +- dir.c | 2 +- docs/index-ja.html | 6 +++--- docs/index.html | 6 +++--- expected/option.out | 2 +- idxpagehdr.h | 2 +- init.c | 2 +- parray.c | 2 +- parray.h | 2 +- pg_rman.c | 4 ++-- pg_rman.h | 2 +- pgut/pgut-port.c | 2 +- pgut/pgut-port.h | 2 +- pgut/pgut.c | 2 +- pgut/pgut.h | 2 +- restore.c | 2 +- script/snapshot_script_lvm.sh | 2 +- show.c | 2 +- util.c | 2 +- validate.c | 2 +- xlog.c | 2 +- 25 files changed, 31 insertions(+), 31 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 2551eb8..340fd6c 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,6 +1,6 @@ -Copyright (c) 2009-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION +Copyright (c) 2009-2025, NIPPON TELEGRAPH AND TELEPHONE CORPORATION -Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group +Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group Portions Copyright (c) 1994, The Regents of the University of California Redistribution and use in source and binary forms, with or without diff --git a/backup.c b/backup.c index 0f7cbf8..9775575 100644 --- a/backup.c +++ b/backup.c @@ -2,7 +2,7 @@ * * backup.c: backup DB cluster, archived WAL, serverlog. * - * Copyright (c) 2009-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Copyright (c) 2009-2025, NIPPON TELEGRAPH AND TELEPHONE CORPORATION * *------------------------------------------------------------------------- */ diff --git a/catalog.c b/catalog.c index 9cf7fd8..4ea4034 100644 --- a/catalog.c +++ b/catalog.c @@ -2,7 +2,7 @@ * * catalog.c: backup catalog operation * - * Copyright (c) 2009-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Copyright (c) 2009-2025, NIPPON TELEGRAPH AND TELEPHONE CORPORATION * *------------------------------------------------------------------------- */ diff --git a/data.c b/data.c index f1a4790..82e60ae 100644 --- a/data.c +++ b/data.c @@ -3,7 +3,7 @@ * data.c: utilities for backing up and restoring database files along with * the support for compression/decompression of individual data file pages * - * Copyright (c) 2009-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Copyright (c) 2009-2025, NIPPON TELEGRAPH AND TELEPHONE CORPORATION * *------------------------------------------------------------------------- */ diff --git a/delete.c b/delete.c index ce20c1a..4b32c2d 100644 --- a/delete.c +++ b/delete.c @@ -2,7 +2,7 @@ * * delete.c: delete backup files. * - * Copyright (c) 2009-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Copyright (c) 2009-2025, NIPPON TELEGRAPH AND TELEPHONE CORPORATION * *------------------------------------------------------------------------- */ diff --git a/dir.c b/dir.c index 1c4d709..d5fffa4 100644 --- a/dir.c +++ b/dir.c @@ -2,7 +2,7 @@ * * dir.c: directory operation utility. * - * Copyright (c) 2009-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Copyright (c) 2009-2025, NIPPON TELEGRAPH AND TELEPHONE CORPORATION * *------------------------------------------------------------------------- */ diff --git a/docs/index-ja.html b/docs/index-ja.html index ba83dab..4cf2a2e 100644 --- a/docs/index-ja.html +++ b/docs/index-ja.html @@ -1459,9 +1459,9 @@

RPMを用いたインストール

動作環境

PostgreSQLバージョン
-
PostgreSQL 12, 13, 14, 15, 16
+
PostgreSQL 13, 14, 15, 16, 17
OS
-
RHEL 7, 8, 9
+
RHEL 8, 9
@@ -1470,7 +1470,7 @@

関連項目

-

Copyright (c) 2009-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION

+

Copyright (c) 2009-2025, NIPPON TELEGRAPH AND TELEPHONE CORPORATION

\ No newline at end of file diff --git a/docs/index.html b/docs/index.html index 57718be..485e1f0 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1449,9 +1449,9 @@

Install from rpm package

Requirements

PostgreSQL
-
PostgreSQL 12, 13, 14, 15, 16
+
PostgreSQL 13, 14, 15, 16, 17
OS
-
RHEL 7, 8, 9
+
RHEL 8, 9
@@ -1460,7 +1460,7 @@

See Also

-

Copyright (c) 2009-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION

+

Copyright (c) 2009-2025, NIPPON TELEGRAPH AND TELEPHONE CORPORATION

\ No newline at end of file diff --git a/expected/option.out b/expected/option.out index dd78747..f764268 100644 --- a/expected/option.out +++ b/expected/option.out @@ -75,7 +75,7 @@ Report bugs to . ###### COMMAND OPTION TEST-0002 ###### ###### version option ###### -pg_rman 1.3.16 +pg_rman 1.3.17 1 ###### COMMAND OPTION TEST-0003 ###### diff --git a/idxpagehdr.h b/idxpagehdr.h index bdba734..33ec45b 100644 --- a/idxpagehdr.h +++ b/idxpagehdr.h @@ -13,7 +13,7 @@ * file!!! Although, incompatible changes to the definitions in this file * will be rare. * - * Copyright (c) 2009-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Copyright (c) 2009-2025, NIPPON TELEGRAPH AND TELEPHONE CORPORATION * *------------------------------------------------------------------------- */ diff --git a/init.c b/init.c index 3c155f2..96feb74 100644 --- a/init.c +++ b/init.c @@ -2,7 +2,7 @@ * * init.c: manage backup catalog. * - * Copyright (c) 2009-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Copyright (c) 2009-2025, NIPPON TELEGRAPH AND TELEPHONE CORPORATION * *------------------------------------------------------------------------- */ diff --git a/parray.c b/parray.c index 3fa2720..1d7eb20 100644 --- a/parray.c +++ b/parray.c @@ -2,7 +2,7 @@ * * parray.c: pointer array collection. * - * Copyright (c) 2009-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Copyright (c) 2009-2025, NIPPON TELEGRAPH AND TELEPHONE CORPORATION * *------------------------------------------------------------------------- */ diff --git a/parray.h b/parray.h index 2a6a1fe..f5ac4c2 100644 --- a/parray.h +++ b/parray.h @@ -2,7 +2,7 @@ * * parray.h: pointer array collection. * - * Copyright (c) 2009-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Copyright (c) 2009-2025, NIPPON TELEGRAPH AND TELEPHONE CORPORATION * *------------------------------------------------------------------------- */ diff --git a/pg_rman.c b/pg_rman.c index db263ae..931a36b 100644 --- a/pg_rman.c +++ b/pg_rman.c @@ -2,7 +2,7 @@ * * pg_rman.c: Backup/Recovery manager for PostgreSQL. * - * Copyright (c) 2009-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Copyright (c) 2009-2025, NIPPON TELEGRAPH AND TELEPHONE CORPORATION * *------------------------------------------------------------------------- */ @@ -14,7 +14,7 @@ #include #include -const char *PROGRAM_VERSION = "1.3.16"; +const char *PROGRAM_VERSION = "1.3.17"; const char *PROGRAM_URL = "http://github.com/ossc-db/pg_rman"; const char *PROGRAM_ISSUES = "http://github.com/ossc-db/pg_rman/issues"; diff --git a/pg_rman.h b/pg_rman.h index f618db3..8fc4409 100644 --- a/pg_rman.h +++ b/pg_rman.h @@ -2,7 +2,7 @@ * * pg_rman.h: Backup/Recovery manager for PostgreSQL. * - * Copyright (c) 2009-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Copyright (c) 2009-2025, NIPPON TELEGRAPH AND TELEPHONE CORPORATION * *------------------------------------------------------------------------- */ diff --git a/pgut/pgut-port.c b/pgut/pgut-port.c index 369ca08..b3e05ff 100644 --- a/pgut/pgut-port.c +++ b/pgut/pgut-port.c @@ -2,7 +2,7 @@ * * pgut-port.c * - * Copyright (c) 2009-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Copyright (c) 2009-2025, NIPPON TELEGRAPH AND TELEPHONE CORPORATION * *------------------------------------------------------------------------- */ diff --git a/pgut/pgut-port.h b/pgut/pgut-port.h index d148dae..9bc3c06 100644 --- a/pgut/pgut-port.h +++ b/pgut/pgut-port.h @@ -2,7 +2,7 @@ * * pgut-port.h * - * Copyright (c) 2009-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Copyright (c) 2009-2025, NIPPON TELEGRAPH AND TELEPHONE CORPORATION * *------------------------------------------------------------------------- */ diff --git a/pgut/pgut.c b/pgut/pgut.c index 978b99c..1c24cb5 100644 --- a/pgut/pgut.c +++ b/pgut/pgut.c @@ -2,7 +2,7 @@ * * pgut.c * - * Copyright (c) 2009-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Copyright (c) 2009-2025, NIPPON TELEGRAPH AND TELEPHONE CORPORATION * *------------------------------------------------------------------------- */ diff --git a/pgut/pgut.h b/pgut/pgut.h index 78b0c4a..baac2bd 100644 --- a/pgut/pgut.h +++ b/pgut/pgut.h @@ -2,7 +2,7 @@ * * pgut.h * - * Copyright (c) 2009-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Copyright (c) 2009-2025, NIPPON TELEGRAPH AND TELEPHONE CORPORATION * *------------------------------------------------------------------------- */ diff --git a/restore.c b/restore.c index 19c8f45..e152366 100644 --- a/restore.c +++ b/restore.c @@ -2,7 +2,7 @@ * * restore.c: restore DB cluster and archived WAL. * - * Copyright (c) 2009-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Copyright (c) 2009-2025, NIPPON TELEGRAPH AND TELEPHONE CORPORATION * *------------------------------------------------------------------------- */ diff --git a/script/snapshot_script_lvm.sh b/script/snapshot_script_lvm.sh index 93e16cd..09f24b1 100644 --- a/script/snapshot_script_lvm.sh +++ b/script/snapshot_script_lvm.sh @@ -1,6 +1,6 @@ #!/bin/sh ############################################################################# -# Copyright (c) 2009-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION +# Copyright (c) 2009-2025, NIPPON TELEGRAPH AND TELEPHONE CORPORATION ############################################################################# CMD_SUDO="/usr/bin/sudo" diff --git a/show.c b/show.c index 15e2831..4734c1e 100644 --- a/show.c +++ b/show.c @@ -2,7 +2,7 @@ * * show.c: show backup catalog. * - * Copyright (c) 2009-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Copyright (c) 2009-2025, NIPPON TELEGRAPH AND TELEPHONE CORPORATION * *------------------------------------------------------------------------- */ diff --git a/util.c b/util.c index 6a0c6c4..d42370b 100644 --- a/util.c +++ b/util.c @@ -2,7 +2,7 @@ * * util.c: log messages to log file or stderr, and misc code. * - * Copyright (c) 2009-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Copyright (c) 2009-2025, NIPPON TELEGRAPH AND TELEPHONE CORPORATION * *------------------------------------------------------------------------- */ diff --git a/validate.c b/validate.c index 968ee0e..a649922 100644 --- a/validate.c +++ b/validate.c @@ -2,7 +2,7 @@ * * validate.c: validate backup files. * - * Copyright (c) 2009-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Copyright (c) 2009-2025, NIPPON TELEGRAPH AND TELEPHONE CORPORATION * *------------------------------------------------------------------------- */ diff --git a/xlog.c b/xlog.c index 6dd574f..1d4ba72 100644 --- a/xlog.c +++ b/xlog.c @@ -2,7 +2,7 @@ * * xlog.c: Parse WAL files. * - * Copyright (c) 2009-2023, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Copyright (c) 2009-2025, NIPPON TELEGRAPH AND TELEPHONE CORPORATION * *------------------------------------------------------------------------- */ From 56c509b083acf8f13657213af4108aa12bcc1697 Mon Sep 17 00:00:00 2001 From: zw_yan Date: Tue, 28 Jan 2025 09:32:25 +0900 Subject: [PATCH 2/2] Update build.yml --- .github/workflows/build.yml | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index da67062..bd8921a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,28 +4,26 @@ on: push: branches: - master + - REL_17_STABLE - REL_16_STABLE - REL_15_STABLE - REL_14_STABLE - REL_13_STABLE - - REL_12_STABLE - - REL_11_STABLE pull_request: branches: - master + - REL_17_STABLE - REL_16_STABLE - REL_15_STABLE - REL_14_STABLE - REL_13_STABLE - - REL_12_STABLE - - REL_11_STABLE jobs: build: runs-on: ubuntu-latest timeout-minutes: 30 env: - CACHE_VERSION: 20250124 # to identify cache version + CACHE_VERSION: 20250128 # to identify cache version steps: - name: get current branch name @@ -41,13 +39,12 @@ jobs: shell: bash -xe {0} run: | declare -A versions=( - ["master"]="16.1" - ["REL_16_STABLE"]="16.1" - ["REL_15_STABLE"]="15.5" - ["REL_14_STABLE"]="14.10" - ["REL_13_STABLE"]="13.13" - ["REL_12_STABLE"]="12.17" - ["REL_11_STABLE"]="11.18" + ["master"]="17.2" + ["REL_17_STABLE"]="17.2" + ["REL_16_STABLE"]="16.6" + ["REL_15_STABLE"]="15.10" + ["REL_14_STABLE"]="14.15" + ["REL_13_STABLE"]="13.18" ) [ -z "${versions[${{ env.BRANCH }}]}" ] && exit 1 # check if the key exists echo "PGVERSION=${versions[${{ env.BRANCH }}]}" >> $GITHUB_ENV