Skip to content

Commit 2baa7cb

Browse files
authored
Merge pull request #98 from bastelfreak/java11
Remove Java 11
2 parents cbe6111 + 53bc8a4 commit 2baa7cb

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

.github/workflows/daily.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ jobs:
2222
flavor:
2323
- core+ext/openjdk21/pg-15
2424
- core+ext/openjdk17/pg-15
25-
- core+ext/openjdk11/pg-11
2625

2726
os: [ubuntu-24.04]
2827
ruby: ['3.2']
@@ -36,18 +35,18 @@ jobs:
3635
include:
3736
- os: ubuntu-24.04
3837
ruby: '3.2'
39-
flavor: core+ext/openjdk11/pg-16
38+
flavor: core+ext/openjdk17/pg-16
4039
drop-joins: by-request
4140
- os: ubuntu-24.04
4241
ruby: '3.2'
43-
flavor: core+ext/openjdk11/pg-16
42+
flavor: core+ext/openjdk17/pg-16
4443
lein-profile: fips
4544

4645
# non-rich variants for main
4746
- os: ubuntu-24.04
4847
branch: main
4948
ruby: '3.2'
50-
flavor: int/openjdk11/pup-main/srv-main/pg-16
49+
flavor: int/openjdk17/pup-main/srv-main/pg-16
5150

5251
steps:
5352
- name: Compute job outputs

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ jobs:
139139
uses: actions/setup-java@v5
140140
with:
141141
distribution: 'temurin'
142-
java-version: 11
142+
java-version: 17
143143
- name: setup ruby
144144
uses: ruby/setup-ruby@v1
145145
with:

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ FROM almalinux:9
22

33
WORKDIR /
44

5-
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
5+
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
66
RUN wget https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein
77
RUN chmod a+x lein
88
RUN mv lein /usr/local/bin
99
RUN wget -q https://github.com/rbenv/rbenv-installer/raw/HEAD/bin/rbenv-installer -O- | bash
10-
RUN /bin/bash --login -c 'rbenv install 3.2.6'
11-
RUN /bin/bash --login -c 'rbenv global 3.2.6'
10+
RUN /bin/bash --login -c 'rbenv install 3.2.9'
11+
RUN /bin/bash --login -c 'rbenv global 3.2.9'
1212
RUN git config --global user.email "openvox@voxpupuli.org"
1313
RUN git config --global user.name "Vox Pupuli"
1414
RUN git config --global --add safe.directory /code

0 commit comments

Comments
 (0)