Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

604 missing dependencies in jar #605

Merged
merged 13 commits into from
Jul 13, 2023
Merged

604 missing dependencies in jar #605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c82a408
switched buiding the rocksdbjavastatic from native to docker based
maxb-io Jul 11, 2023
860236c
switched buiding the rocksdbjavastatic from native to docker based
maxb-io Jul 11, 2023
727d45c
switched buiding the rocksdbjavastatic from native to docker based
maxb-io Jul 11, 2023
e097173
switched buiding the rocksdbjavastatic from native to docker based
maxb-io Jul 11, 2023
856875e
switched buiding the rocksdbjavastatic from native to docker based
maxb-io Jul 11, 2023
8c33810
switched buiding the rocksdbjavastatic from native to docker based fo…
maxb-io Jul 11, 2023
7c8ea62
test rename
maxb-io Jul 11, 2023
4d546f4
test rename
maxb-io Jul 11, 2023
b727bfd
test rename
maxb-io Jul 11, 2023
5dc228a
test rename
maxb-io Jul 11, 2023
c40f289
deleted commented directives
maxb-io Jul 13, 2023
b45b71c
rename bld_java_ubu_arm.yml -> ci_ubuntu_arm.yml
maxb-io Jul 13, 2023
5ca4a43
renamed steps in build_and_publish_jar.yml
maxb-io Jul 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions .github/workflows/build_and_publish_jar.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,25 +33,25 @@ jobs:
patch=$(( $(grep '_PATCH\s\+[0-9]\+' "$VERSION_FILE" | sed 's/[^0-9]\+//') + 1 )) && echo $patch
echo "verSion=$major.$minor.$patch" >> $GITHUB_OUTPUT

Mac_i86_Bld:
Mac_i86:
needs: pre_build
uses: ./.github/workflows/ci_macos.yml
with:
verSion: ${{ needs.pre_build.outputs.out1 }}

Mac_ARM_Bld:
Mac_ARM:
needs: pre_build
uses: ./.github/workflows/ci_macos_ARM.yml
with:
verSion: ${{ needs.pre_build.outputs.out1 }}

Ubu_ARM_Bld:
Ubuntu_ARM:
needs: pre_build
uses: ./.github/workflows/bld_java_ubu_arm.yml
uses: ./.github/workflows/ci_ubuntu_arm.yml
with:
verSion: ${{ needs.pre_build.outputs.out1 }}

Windows_Bld:
Windows:
needs: pre_build
uses: ./.github/workflows/ci_windows.yml
with:
Expand All @@ -60,9 +60,9 @@ jobs:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_BUCKET: ${{ secrets.AWS_BUCKET }}

Build_and_upload:
needs: [pre_build, Mac_i86_Bld, Windows_Bld, Ubu_ARM_Bld]
needs: [pre_build, Mac_i86, Windows, Ubuntu_ARM]
runs-on: ubu4mvn
env:
VERSION_FILE: speedb/version.h
Expand All @@ -86,10 +86,12 @@ jobs:
export JAVA_HOME="$(jrunscript -e 'java.lang.System.out.println(java.lang.System.getProperty("java.home"));')"
export LIB_JAVA_VERSION=11.0.17
export the_version=${{ steps.find_version.outputs.verSion }}
PORTABLE=1 DEBUG_LEVEL=0 make -j $(nproc) rocksdbjavastatic
export SPDB_LIB_DIR=~/spdb_lib && mkdir -p $SPDB_LIB_DIR
docker run --rm -v $(readlink -f ${SPDB_LIB_DIR}):/out -i speedb-centos-builder ${{ github.ref_name }}
cd java
mkdir src/main/resources
cp target/libspeedbjni-linux64.so src/main/resources
cp $SPDB_LIB_DIR/libspeedbjni-linux64.so src/main/resources
mv $SPDB_LIB_DIR/libspeedbjni-linux64.so{,_$(date '+%d_%m_%Y__%H_%M_%S')}
echo "aws s3 --profile nd7 cp --recursive s3://spdb-builder/jar_test/v$VERSION/ java/src/main/resources/"
sleep 180
aws s3 --profile nd7 cp --recursive s3://spdb-builder/jar_test/v$VERSION/ src/main/resources/
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/bld_java_ubu_arm.yml → .github/workflows/ci_ubuntu_arm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@ jobs:

- name: 'build'
run: |
export JAVA_HOME=$(jrunscript -e 'java.lang.System.out.println(java.lang.System.getProperty("java.home"));')
PORTABLE=1 DEBUG_LEVEL=0 make -j $(nproc) rocksdbjavastatic
export SPDB_LIB_DIR=~/spdb_lib && mkdir -p $SPDB_LIB_DIR
docker run --rm -v $(readlink -f ${SPDB_LIB_DIR}):/out -i speedb-centos-builder ${{ github.ref_name }}

- name: 'upload artifacts' #This step executed only when this workflow is called by another and a version is provided
if: inputs.verSion != ' '
run: aws s3 cp java/target/libspeedbjni-linux-aarch64.so s3://spdb-builder/jar_test/v${{ inputs.verSion }}/libspeedbjni-linux-aarch64.so
run: |
aws s3 cp ~/spdb_lib/libspeedbjni-linux-aarch64.so s3://spdb-builder/jar_test/v${{ inputs.verSion }}/libspeedbjni-linux-aarch64.so
mv ~/spdb_lib/libspeedbjni-linux-aarch64.so{,_$(date '+%d_%m_%Y__%H_%M_%S')}