Skip to content

Commit e684a3c

Browse files
authored
changes for oracle8 (RedisGears#706)
* changes for oracle8
1 parent db3e7f0 commit e684a3c

File tree

9 files changed

+57
-6
lines changed

9 files changed

+57
-6
lines changed

.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ workflows:
384384
context: common
385385
matrix:
386386
parameters:
387-
platform: [hirsute, focal, bionic, xenial, centos7, centos8, bullseye]
387+
platform: [hirsute, focal, bionic, xenial, centos7, ol8, bullseye]
388388
- valgrind:
389389
<<: *on-integ-and-version-tags
390390
- build-macos:
+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: Publish JVMPlugin Release
2+
3+
on:
4+
push:
5+
tags:
6+
- '*'
7+
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- uses: actions/checkout@v2
14+
15+
- name: get version from tag
16+
id: get_version
17+
run: |
18+
realversion="${GITHUB_REF/refs\/tags\//}"
19+
realversion="${realversion//v/}"
20+
echo "::set-output name=VERSION::$realversion"
21+
22+
- name: Set up publishing to maven central
23+
uses: actions/setup-java@v2
24+
with:
25+
java-version: '8'
26+
distribution: 'temurin'
27+
server-id: ossrh
28+
server-username: MAVEN_USERNAME
29+
server-password: MAVEN_PASSWORD
30+
31+
- name: mvn versions
32+
working-directory: ./plugins/jvmplugin/gears_runtime
33+
run:
34+
mvn versions:set -DnewVersion=${{ steps.get_version.outputs.VERSION }}
35+
36+
- name: Install gpg key
37+
run: |
38+
cat <(echo -e "${{ secrets.OSSRH_GPG_SECRET_KEY }}") | gpg --batch --import
39+
gpg --list-secret-keys --keyid-format LONG
40+
41+
- name: Publish
42+
working-directory: ./plugins/jvmplugin/gears_runtime
43+
run: |
44+
mvn --no-transfer-progress \
45+
--batch-mode \
46+
-Dgpg.passphrase='${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}' \
47+
-DskipTests deploy -P release
48+
env:
49+
MAVEN_USERNAME: ${{secrets.OSSH_USERNAME}}
50+
MAVEN_PASSWORD: ${{secrets.OSSH_TOKEN}}

Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ ADD . /build
3232

3333
RUN ./deps/readies/bin/getpy2
3434
RUN ./deps/readies/bin/getpy3
35+
RUN ./deps/readies/bin/getredis -v ${REDIS_VER}
3536
RUN ./system-setup.py
3637
RUN ./plugins/jvmplugin/system-setup.py
3738
RUN bash -l -c "make all SHOW=1"

build/cpython/system-setup.py

-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ def debian_compat(self):
3131
if sh("apt-cache search libgdbm-compat-dev") != "":
3232
self.install("libgdbm-compat-dev")
3333
self.install("libgdbm-dev")
34-
self.install("tcl-dev tix-dev tk-dev")
3534

3635
self.install("lsb-release")
3736

@@ -42,7 +41,6 @@ def redhat_compat(self):
4241

4342
self.install("bzip2-devel expat-devel gdbm-devel glibc-devel gmp-devel libffi-devel libuuid-devel ncurses-devel "
4443
"openssl-devel readline-devel sqlite-devel xz-devel zlib-devel")
45-
self.install("tcl-devel tix-devel tk-devel")
4644

4745
self.install("redhat-lsb-core")
4846
self.install("libatomic file")
@@ -55,7 +53,6 @@ def fedora(self):
5553
self.install("autoconf automake libtool")
5654
self.install("bzip2-devel expat-devel gdbm-devel glibc-devel gmp-devel libffi-devel libnsl2-devel libuuid-devel ncurses-devel "
5755
"openssl-devel readline-devel sqlite-devel xz-devel zlib-devel")
58-
self.install("tcl-devel tix-devel tk-devel")
5956

6057
self.install("libatomic file")
6158

pack.sh

+1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ OSNICK=$($READIES/bin/platform --osnick)
6565
[[ $OSNICK == focal ]] && OSNICK=ubuntu20.04
6666
[[ $OSNICK == centos7 ]] && OSNICK=rhel7
6767
[[ $OSNICK == centos8 ]] && OSNICK=rhel8
68+
[[ $OSNICK == ol8 ]] && OSNICK=rhel8
6869

6970
OS_DESC=$(python2 $ROOT/getos.py)
7071

plugins/jvmplugin/gears_runtime/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.redislabs</groupId>
88
<artifactId>gear_runtime</artifactId>
9-
<version>0.0.3-SNAPSHOT</version>
9+
<version>1.2.0-SNAPSHOT</version>
1010

1111
<name>Gears Runtime</name>
1212
<description/>

plugins/jvmplugin/pack.sh

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ set -e
99
[[ $OSNICK == focal ]] && OSNICK=ubuntu20.04
1010
[[ $OSNICK == centos7 ]] && OSNICK=rhel7
1111
[[ $OSNICK == centos8 ]] && OSNICK=rhel8
12+
[[ $OSNICK == ol8 ]] && OSNICK=rhel8
1213

1314
tar -czf ../../artifacts/snapshot/redisgears-jvm.Linux-$OSNICK-x86_64.$GIT_BRANCH.tgz \
1415
--transform "s,^./src/,./plugin/," \

plugins/jvmplugin/system-setup.py

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ def debian_compat(self):
2222

2323
def common_last(self):
2424
self.install("maven")
25+
self.run("{PYTHON} -m pip install --upgrade pip".format(PYTHON=self.python, READIES=READIES))
2526
self.run("{PYTHON} {READIES}/bin/getrmpytools".format(PYTHON=self.python, READIES=READIES))
2627

2728
#----------------------------------------------------------------------------------------------

0 commit comments

Comments
 (0)