Skip to content

Commit

Permalink
Remove JDK configuration from CI
Browse files Browse the repository at this point in the history
For quite some time we have configured a specific version of the JDK in
our CI.

As far as I understand it, modern versions of Elasticsearch use a
bundled version of the JDK so this configuration may no longer be
relevant.

On a practical/security note: it also looks like [the
scripts](https://github.com/michaelklishin/jdk_switcher) used to switch
JDK versions are over 4 years old, and just calling a bash script from a
3rd party repository is a bit scary.

I don't see any changes due to the removal of this option, is it
possible we don't need it anymore?
  • Loading branch information
orangejulius committed Feb 11, 2025
1 parent 1319c20 commit 45bec95
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/_integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,16 @@ jobs:
- ubuntu-22.04
node-version: [18.x, 20.x, 22.x]
es-version: [7.6.1]
jdk-version: [oraclejdk11]
icuTokenizer: [true, false]
steps:
- uses: actions/checkout@v4
- name: Install node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: Start elasticsearch ${{ matrix.es-version }} (${{ matrix.jdk-version }})
- name: Start elasticsearch ${{ matrix.es-version }}
env:
ES_VERSION: ${{ matrix.es-version }}
JDK_VERSION: ${{ matrix.jdk-version }}
run: ./scripts/setup_ci.sh
- name: Run integration tests
run: |
Expand Down
3 changes: 0 additions & 3 deletions scripts/setup_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ set -e
# create elasticsearch directory
mkdir /tmp/elasticsearch

# allow switching the JDK version
curl -s https://raw.githubusercontent.com/michaelklishin/jdk_switcher/master/jdk_switcher.sh | bash -s use "${JDK_VERSION}"

# download and install elasticsearch with ICU plugin
FILENAME="elasticsearch-${ES_VERSION}-linux-x86_64.tar.gz"
STRIP_COMPONENTS=1
Expand Down

0 comments on commit 45bec95

Please sign in to comment.