From 907e4d74c3e00ea6b3b25d4f7b0aeafbde7e152e Mon Sep 17 00:00:00 2001 From: xDark <19853368+xxDark@users.noreply.github.com> Date: Sun, 5 Jun 2022 14:07:29 +0300 Subject: [PATCH] Return build --- .github/workflows/build.yml | 27 +++++++++------- .releaserc.json | 32 +++++++++++++++++++ .../java/dev/xdark/ssvm/util/UnsafeUtil.java | 2 +- 3 files changed, 48 insertions(+), 13 deletions(-) create mode 100644 .releaserc.json diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0d8f6ced..e6f03a83 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,10 +2,10 @@ name: CI on: push: - branches: + branches: - master pull_request: - branches: + branches: - master permissions: @@ -23,13 +23,16 @@ jobs: runs-on: ${{ matrix.os }} timeout-minutes: 10 steps: - - uses: actions/checkout@v2 - with: - persist-credentials: false - - name: Setup Java JDK - uses: actions/setup-java@v2.5.0 - with: - distribution: adopt-hotspot - java-version: ${{ matrix.java-version }} - - run: ./gradlew --info test - + - uses: actions/checkout@v2 + with: + persist-credentials: false + - name: Setup Java JDK + uses: actions/setup-java@v2.5.0 + with: + distribution: adopt-hotspot + java-version: ${{ matrix.java-version }} + - run: ./gradlew --info build + - name: Semantic Release + uses: cycjimmy/semantic-release-action@v3 + env: + GITHUB_TOKEN: ${{ secrets.CI_TOKEN }} diff --git a/.releaserc.json b/.releaserc.json new file mode 100644 index 00000000..cbde3f91 --- /dev/null +++ b/.releaserc.json @@ -0,0 +1,32 @@ +{ + "tagFormat": "${version}", + "branches": [ + { + "name": "master" + }, + { + "name": "develop", + "prerelease": true + } + ], + "plugins": [ + ["@semantic-release/commit-analyzer", { + "releaseRules": [ + {"type": "minor", "release": "patch"} + ] + }], + "@semantic-release/release-notes-generator", + [ + "@semantic-release/github", + { + "successComment": false, + "failComment": false, + "assets": [ + { + "path": "build/libs/*.jar" + } + ] + } + ] + ] +} \ No newline at end of file diff --git a/src/main/java/dev/xdark/ssvm/util/UnsafeUtil.java b/src/main/java/dev/xdark/ssvm/util/UnsafeUtil.java index a27552bc..d8b587cf 100644 --- a/src/main/java/dev/xdark/ssvm/util/UnsafeUtil.java +++ b/src/main/java/dev/xdark/ssvm/util/UnsafeUtil.java @@ -81,7 +81,7 @@ public Object byAddress(long address) { if (unsafe == null) { throw new IllegalStateException("Unable to locate unsafe instance"); } - ADDRESS_SIZE = unsafe.addressSize() >> 2;; + ADDRESS_SIZE = unsafe.addressSize() >> 2; ARRAY_OBJECT_BASE_OFFSET = unsafe.arrayBaseOffset(Object[].class); ARRAY_BYTE_BASE_OFFSET = unsafe.arrayBaseOffset(byte[].class); UNSAFE = unsafe;