Merge pull request #16 from wireapp/fix-pipelines

Fix pipelines
wireapp · Jul 13, 2022 · 411b6b4 · 411b6b4
2 parents 9af1020 + b3d7f99
commit 411b6b4
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 35 deletions.
diff --git a/.github/workflows/native-tests.yml b/.github/workflows/native-tests.yml
@@ -10,23 +10,31 @@ jobs:
   tests:
     name: Execute tests
     runs-on: ubuntu-latest
-    container: wirebot/cryptobox:latest
     steps:
       - uses: actions/checkout@v2
 
-      - name: Execute Tests
+      - uses: actions/setup-java@v3
+        with:
+          distribution: zulu
+          java-version: 11
+
+      - name: Build Cryptobox
+        run: |
+          make cryptobox
+
+      - name: Build Native Bindings
         run: |
-          mvn test -DargLine="-Djava.library.path=$LD_LIBRARY_PATH"
+          make compile-native
 
-      - name: Try to create package
+      - name: Compile Cryptobox4j & Run Tests
         run: |
-          mvn package -DskipTests
+          make verify-java
 
       - name: Webhook to Wire
         uses: 8398a7/action-slack@v2
         with:
           status: ${{ job.status }}
-          author_name: Cryptobox4j - Test
+          author_name: Cryptobox4J - Test
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.webhook }}
         if: failure()
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -10,22 +10,19 @@ jobs:
     secrets:
       webhook: ${{ secrets.WEBHOOK_RELEASE }}
 
-  # TODO: figure out why ARM builds fail after 1h in Github Actions
-  #  test_docker_arm64:
-  #    uses: ./.github/workflows/docker.yml
-  #    needs: [ tests ]
-  #    with:
-  #      publish: false
-  #      cryptobox_image: wirebot/cryptobox
-  #      runtime_image: wirebot/runtime
-  #      platform: linux/arm64
-  #    secrets:
-  #      docker_password: ${{ secrets.DOCKERHUB_PASSWORD }}
-  #      webhook: ${{ secrets.WEBHOOK_RELEASE }}
+  test_docker_arm64:
+    uses: ./.github/workflows/docker.yml
+    with:
+      publish: false
+      cryptobox_image: wirebot/cryptobox
+      runtime_image: wirebot/runtime
+      platform: linux/arm64
+    secrets:
+      docker_password: ${{ secrets.DOCKERHUB_PASSWORD }}
+      webhook: ${{ secrets.WEBHOOK_RELEASE }}
 
   test_docker_amd64:
     uses: ./.github/workflows/docker.yml
-    needs: [ tests ]
     with:
       publish: false
       cryptobox_image: wirebot/cryptobox

diff --git a/.github/workflows/release-docker.yml b/.github/workflows/release-docker.yml
@@ -14,18 +14,17 @@ jobs:
     secrets:
       webhook: ${{ secrets.WEBHOOK_RELEASE }}
 
-  # TODO: figure out why ARM builds fail after 1h in Github Actions
-  #  release_docker_arm64:
-  #    uses: ./.github/workflows/docker.yml
-  #    needs: [ tests ]
-  #    with:
-  #      publish: true
-  #      cryptobox_image: wirebot/cryptobox
-  #      runtime_image: wirebot/runtime
-  #      platform: linux/arm64
-  #    secrets:
-  #      docker_password: ${{ secrets.DOCKERHUB_PASSWORD }}
-  #      webhook: ${{ secrets.WEBHOOK_RELEASE }}
+  release_docker_arm64:
+    uses: ./.github/workflows/docker.yml
+    needs: [ tests ]
+    with:
+      publish: true
+      cryptobox_image: wirebot/cryptobox
+      runtime_image: wirebot/runtime
+      platform: linux/arm64
+    secrets:
+      docker_password: ${{ secrets.DOCKERHUB_PASSWORD }}
+      webhook: ${{ secrets.WEBHOOK_RELEASE }}
 
   release_docker_amd64:
     uses: ./.github/workflows/docker.yml

diff --git a/Makefile b/Makefile
@@ -54,9 +54,14 @@ compile-native:
 	    -o build/lib/$(LIBCRYPTOBOX_JNI)
 
 .PHONY: compile-java
-compile-java:
+compile-java: compile-native
 	export LD_LIBRARY_PATH="$(PWD)/build/lib"; \
-	mvn package -DargLine="-Djava.library.path=$$LD_LIBRARY_PATH";
+	mvn package -DskipTests -DargLine="-Djava.library.path=$$LD_LIBRARY_PATH";
+
+.PHONY: verify-java
+verify-java: compile-java
+	export LD_LIBRARY_PATH="$(PWD)/build/lib"; \
+	mvn test -DskipTests -DargLine="-Djava.library.path=$$LD_LIBRARY_PATH";
 
 .PHONY: distclean
 distclean:

diff --git a/README.md b/README.md
@@ -8,6 +8,6 @@ See makefiles in [mk](mk) directory.
 <dependency>
   <groupId>com.wire</groupId>
   <artifactId>cryptobox4j</artifactId>
-  <version>1.1.1</version>
+  <version>1.1.2</version>
 </dependency>
 ```
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.wire</groupId>
     <artifactId>cryptobox4j</artifactId>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
 
     <name>Cryptobox4J</name>
     <description>CryptoBox for Wire Bots</description>