Skip to content

Commit

Permalink
added workflow for ubuntu on arm
Browse files Browse the repository at this point in the history
  • Loading branch information
maxb-io committed Jul 3, 2023
1 parent f12187a commit bf60279
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 13 deletions.
14 changes: 8 additions & 6 deletions .github/workflows/build_and_publish_jar.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
# This workflow will build Speedb on a Mac OS server
# This workflow will build Speedb library on Mac i86 and ARM, Ubuntu i86 and Arm, Windows i86. Then build a jar and publish to Maven central
#
# This workflow assumes the self hosted runner on a Windows machine is ready.
# The Mac OS server must have all the tools and software required for Speedb building to be installed


name: build all and publish jar

Expand Down Expand Up @@ -48,6 +45,12 @@ jobs:
with:
verSion: ${{ needs.pre_build.outputs.out1 }}

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

Windows_Bld:
needs: pre_build
uses: ./.github/workflows/ci_windows.yml
Expand All @@ -59,7 +62,7 @@ jobs:
AWS_BUCKET: ${{ secrets.AWS_BUCKET }}

Build_and_upload:
needs: [pre_build, Mac_i86_Bld, Windows_Bld]
needs: [pre_build, Mac_i86_Bld, Windows_Bld, Ubu_ARM_Bld]
runs-on: ubu4mvn
env:
VERSION_FILE: speedb/version.h
Expand Down Expand Up @@ -88,7 +91,6 @@ jobs:
mkdir src/main/resources
cp target/libspeedbjni-linux64.so src/main/resources
echo "aws s3 --profile nd7 cp --recursive s3://spdb-builder/jar_test/v$VERSION/ java/src/main/resources/"
echo "waiting 3 minutes for you to upload your files"
sleep 180
aws s3 --profile nd7 cp --recursive s3://spdb-builder/jar_test/v$VERSION/ src/main/resources/
ls -l src/main/resources/
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/ci_pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,7 @@ jobs:
if: ${{ github.event.review.state == 'approved' || github.event_name == 'workflow_dispatch' || startsWith(github.ref, 'refs/heads/release') }}
needs: [Build]
uses: ./.github/workflows/test_fuzz.yml

Check-Licence-And-History:
if: ${{ github.event_name == 'pull_request' }}
uses: ./.github/workflows/check_license_and_history.yml
14 changes: 8 additions & 6 deletions .github/workflows/sanity_check.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
name: Check buck targets and code format
on: [push, pull_request, workflow_call, workflow_dispatch]
on: [push, workflow_call, workflow_dispatch]
permissions:
contents: read

jobs:
check:
name: Check TARGETS file and code format
#runs-on: ubuntu:20.04
runs-on: [self-hosted, ubuntu, asrunner]
container:
image: ubuntu:latest
image: ubuntu:focal
steps:

- name: pre
run: apt update && apt install -y sudo git make clang build-essential clang-format
run: apt update && apt install -y sudo git make clang build-essential clang-format wget

- name: Checkout feature branch
uses: actions/checkout@v2
Expand Down Expand Up @@ -39,9 +42,8 @@ jobs:
run: pip install argparse

- name: Download clang-format-diff.py
uses: wei/wget@v1
with:
args: https://raw.githubusercontent.com/llvm/llvm-project/release/12.x/clang/tools/clang-format/clang-format-diff.py
run: |
wget https://raw.githubusercontent.com/llvm/llvm-project/release/12.x/clang/tools/clang-format/clang-format-diff.py
- name: Check format
run: VERBOSE_CHECK=1 make check-format
Expand Down
2 changes: 1 addition & 1 deletion speedb/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#define SPEEDB_MAJOR 2
#define SPEEDB_MINOR 4
#define SPEEDB_PATCH 11
#define SPEEDB_PATCH 12

namespace ROCKSDB_NAMESPACE {

Expand Down

0 comments on commit bf60279

Please sign in to comment.