diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index 4d97a7da6..92e055cdc 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -22,7 +22,6 @@ jobs: flavor: - core+ext/openjdk21/pg-15 - core+ext/openjdk17/pg-15 - - core+ext/openjdk11/pg-11 os: [ubuntu-24.04] ruby: ['3.2'] @@ -36,18 +35,18 @@ jobs: include: - os: ubuntu-24.04 ruby: '3.2' - flavor: core+ext/openjdk11/pg-16 + flavor: core+ext/openjdk17/pg-16 drop-joins: by-request - os: ubuntu-24.04 ruby: '3.2' - flavor: core+ext/openjdk11/pg-16 + flavor: core+ext/openjdk17/pg-16 lein-profile: fips # non-rich variants for main - os: ubuntu-24.04 branch: main ruby: '3.2' - flavor: int/openjdk11/pup-main/srv-main/pg-16 + flavor: int/openjdk17/pup-main/srv-main/pg-16 steps: - name: Compute job outputs diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5785e3b0a..3dd747edd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -139,7 +139,7 @@ jobs: uses: actions/setup-java@v5 with: distribution: 'temurin' - java-version: 11 + java-version: 17 - name: setup ruby uses: ruby/setup-ruby@v1 with: diff --git a/Dockerfile b/Dockerfile index aa8bc5a12..91448eebf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,13 +2,13 @@ FROM almalinux:9 WORKDIR / -RUN dnf install -y --enablerepo=crb vim wget git rpm-build java-11-openjdk java-11-openjdk-devel libyaml-devel zlib zlib-devel gcc-c++ patch readline readline-devel libffi-devel openssl-devel make bzip2 autoconf automake libtool bison sqlite-devel +RUN dnf install -y --enablerepo=crb vim wget git rpm-build java-17-openjdk java-17-openjdk-devel libyaml-devel zlib zlib-devel gcc-c++ patch readline readline-devel libffi-devel openssl-devel make bzip2 autoconf automake libtool bison sqlite-devel RUN wget https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein RUN chmod a+x lein RUN mv lein /usr/local/bin RUN wget -q https://github.com/rbenv/rbenv-installer/raw/HEAD/bin/rbenv-installer -O- | bash -RUN /bin/bash --login -c 'rbenv install 3.2.6' -RUN /bin/bash --login -c 'rbenv global 3.2.6' +RUN /bin/bash --login -c 'rbenv install 3.2.9' +RUN /bin/bash --login -c 'rbenv global 3.2.9' RUN git config --global user.email "openvox@voxpupuli.org" RUN git config --global user.name "Vox Pupuli" RUN git config --global --add safe.directory /code diff --git a/project.clj b/project.clj index 92e0ea2ec..1e5751264 100644 --- a/project.clj +++ b/project.clj @@ -268,7 +268,7 @@ ;; in the final package. [puppetlabs/puppetdb ~pdb-version]] :name "puppetdb" - :plugins [[puppetlabs/lein-ezbake ~(or (System/getenv "EZBAKE_VERSION") "3.0.1-SNAPSHOT")]]} + :plugins [[org.openvoxproject/lein-ezbake ~(or (System/getenv "EZBAKE_VERSION") "2.7.1")]]} :testutils {:source-paths ^:replace ["test"] :resource-paths ^:replace [] ;; Something else may need adjustment, but diff --git a/tasks/build.rake b/tasks/build.rake index a094a2650..e19587020 100644 --- a/tasks/build.rake +++ b/tasks/build.rake @@ -12,8 +12,8 @@ require 'tmpdir' # To be fixed one of these days. Relevant stuff: # https://github.com/puppetlabs/ezbake/blob/aeb7735a16d2eecd389a6bd9e5c0cfc7c62e61a5/resources/puppetlabs/lein-ezbake/template/global/tasks/build.rake # https://github.com/puppetlabs/ezbake/blob/aeb7735a16d2eecd389a6bd9e5c0cfc7c62e61a5/resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb -deb_platforms = ENV['DEB_PLATFORMS'] || 'ubuntu-18.04,ubuntu-20.04,ubuntu-22.04,ubuntu-24.04,debian-10,debian-11,debian-12' -rpm_platforms = ENV['RPM_PLATFORMS'] || 'el-7,el-8,el-9,el-10,sles-15,amazon-2023' +deb_platforms = ENV['DEB_PLATFORMS'] || 'ubuntu-20.04,ubuntu-22.04,ubuntu-24.04,debian-10,debian-11,debian-12' +rpm_platforms = ENV['RPM_PLATFORMS'] || 'el-8,el-9,el-10,sles-15,amazon-2023' @debs = deb_platforms.split(',').map{ |p| "base-#{p.split('-').join}-i386.cow" }.join(' ') @rpms = rpm_platforms.split(',').map{ |p| "pl-#{p}-x86_64" }.join(' ')