From dd65c0cf60d50c090511283352ff12d526dac9c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Cs=C3=A1rdi?= Date: Tue, 5 Nov 2024 22:39:14 +0100 Subject: [PATCH] Support more FreeBSD release in nightly and package tools [ci skip] --- .github/workflows/nightly.yaml | 1 + R/push-packages.R | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index 5408b551b..9ee5322d4 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -338,6 +338,7 @@ jobs: matrix: config: - { os: 'freebsd', release: '15.0' } + - { os: 'freebsd', release: '14.2-pre' } - { os: 'freebsd', release: '14.1' } - { os: 'freebsd', release: '13.4' } - { os: 'openbsd' } diff --git a/R/push-packages.R b/R/push-packages.R index 890a202ae..559ccac33 100644 --- a/R/push-packages.R +++ b/R/push-packages.R @@ -641,6 +641,7 @@ create_pak_repo <- local({ # - darwin17.0/x86_64 # - darwin20/aarch64 # - mingw32/x86_64 + # - freebsd15.0/x86_64 # - freebsd14.1/x86_64 # - freebsd13.3/x86_64 # - openbsd7.6/x86_64 @@ -665,6 +666,8 @@ create_pak_repo <- local({ # mingw32/x86_64 # win.binary/mingw32/i386 + /bin/windows/contrib/4.1 -> # mingw32/x86_64 + # source/freebsd15.0/amd64 + /src/contrib -> + # freebsd15.0/x86_64 # source/freebsd14.1/amd64 + /src/contrib -> # freebsd14.1/x86_64 # source/freebsd13.3/amd64 + /src/contrib -> @@ -727,8 +730,23 @@ create_pak_repo <- local({ "source/linux-dietlibc/aarch64/src/contrib" = "../../../../../linux/aarch64", "source/linux-unknown/aarch64/src/contrib" = "../../../../../linux/aarch64", + "source/freebsd15.6/amd64/src/contrib" = "../../../../../freebsd15.6/x86_64", + "source/freebsd15.5/amd64/src/contrib" = "../../../../../freebsd15.5/x86_64", + "source/freebsd15.4/amd64/src/contrib" = "../../../../../freebsd15.4/x86_64", + "source/freebsd15.3/amd64/src/contrib" = "../../../../../freebsd15.3/x86_64", + "source/freebsd15.2/amd64/src/contrib" = "../../../../../freebsd15.2/x86_64", + "source/freebsd15.1/amd64/src/contrib" = "../../../../../freebsd15.1/x86_64", + "source/freebsd15.0/amd64/src/contrib" = "../../../../../freebsd15.0/x86_64", + "source/freebsd14.6/amd64/src/contrib" = "../../../../../freebsd14.6/x86_64", + "source/freebsd14.5/amd64/src/contrib" = "../../../../../freebsd14.5/x86_64", + "source/freebsd14.4/amd64/src/contrib" = "../../../../../freebsd14.4/x86_64", + "source/freebsd14.3/amd64/src/contrib" = "../../../../../freebsd14.3/x86_64", + "source/freebsd14.2/amd64/src/contrib" = "../../../../../freebsd14.2/x86_64", "source/freebsd14.1/amd64/src/contrib" = "../../../../../freebsd14.1/x86_64", - "source/freebsd13.4/amd64/src/contrib" = "../../../../../freebsd13.3/x86_64", + "source/freebsd13.6/amd64/src/contrib" = "../../../../../freebsd13.6/x86_64", + "source/freebsd13.5/amd64/src/contrib" = "../../../../../freebsd13.5/x86_64", + "source/freebsd13.4/amd64/src/contrib" = "../../../../../freebsd13.4/x86_64", + "source/freebsd13.3/amd64/src/contrib" = "../../../../../freebsd13.3/x86_64", "source/openbsd7.6/x86_64/src/contrib" = "../../../../../openbsd7.6/x86_64", "source/openbsd7.5/x86_64/src/contrib" = "../../../../../openbsd7.5/x86_64", "source/openbsd7.4/x86_64/src/contrib" = "../../../../../openbsd7.4/x86_64",