Updated runners

wavesplatform · Jul 31, 2023 · 068c5f8 · 068c5f8
1 parent fddf7be
commit 068c5f8
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 33 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -18,26 +18,24 @@ jobs:
             arch: aarch64
         include:
           - platform: darwin
-            os: macos-10.15
+            os: macos-12
             compiled-path: libcurve25519.dylib
           - platform: linux
-            os: ubuntu-18.04
+            os: ubuntu-20.04
+            extra-packages: gcc-7 g++-7
             compiled-path: libcurve25519.so
           - platform: linux
             arch: aarch64
-            extra-packages: gcc-5-aarch64-linux-gnu g++-5-aarch64-linux-gnu
+            extra-packages: gcc-8-aarch64-linux-gnu g++-8-aarch64-linux-gnu
           - platform: linux
             arch: x86
-            extra-packages: gcc-5 g++-5 gcc-5-multilib g++-5-multilib
-          - platform: linux
-            arch: x86-64
-            extra-packages: gcc-5 g++-5
+            extra-packages: gcc-7-multilib g++-7-multilib
           - platform: win32
             os: ubuntu-20.04
             compiled-path: curve25519.dll
             extra-packages: mingw-w64
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Install build tools
         if: ${{ matrix.extra-packages }}
         run: |
@@ -52,7 +50,7 @@ jobs:
           cmake --build .
           mv ${{ matrix.compiled-path }} target/${{ matrix.target-path || env.target-path }}/
       - name: Upload result
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: native-images.zip
           path: native/build/target/*
@@ -66,14 +64,14 @@ jobs:
       GPG_KEY_ID: ${{ secrets.OSSRH_GPG_KEY_ID }}
       GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_PASSPHRASE }}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          java-version: 8
+          distribution: temurin
       - run: |
-          echo '${{ secrets.OSSRH_GPG_KEY }}' | base64 -d > secret.gpg
           mkdir -p java/src/main/resources
-      - uses: actions/download-artifact@v1
+      - uses: actions/download-artifact@v3
         with:
           name: native-images.zip
           path: java/src/main/resources/
@@ -82,18 +80,17 @@ jobs:
         run: |
           ./gradlew uploadArchives \
             -PsonatypeRepo=https://oss.sonatype.org/content/repositories/snapshots \
-            -PwhisperSonatypeUsername='${{ secrets.OSSRH_USERNAME }}' \
-            -PwhisperSonatypePassword='${{ secrets.OSSRH_PASSWORD }}' \
-            -Psigning.secretKeyRingFile=../secret.gpg \
-            -Psigning.keyId='${{ secrets.OSSRH_GPG_KEY_ID }}' \
-            -Psigning.password='${{ secrets.OSSRH_GPG_PASSPHRASE }}'
+            -PsonatypeUsername='${{ secrets.OSSRH_USERNAME }}' \
+            -PsonatypePassword='${{ secrets.OSSRH_PASSWORD }}' \
+            -PgpgKey='${{ secrets.OSSRH_GPG_KEY_ASCII }}' \
+            -PgpgPassphrase='${{ secrets.OSSRH_GPG_PASSPHRASE }}'
       - name: Publish Release
         if: contains(github.ref, '/tags/')
         run: |
           ./gradlew uploadArchives closeAndReleaseRepository \
             -PsonatypeRepo=https://oss.sonatype.org/service/local/staging/deploy/maven2 \
-            -PwhisperSonatypeUsername='${{ secrets.OSSRH_USERNAME }}' \
-            -PwhisperSonatypePassword='${{ secrets.OSSRH_PASSWORD }}' \
+            -PsonatypeUsername='${{ secrets.OSSRH_USERNAME }}' \
+            -PsonatypePassword='${{ secrets.OSSRH_PASSWORD }}' \
             -Psigning.secretKeyRingFile=../secret.gpg \
             -Psigning.keyId='${{ secrets.OSSRH_GPG_KEY_ID }}' \
             -Psigning.password='${{ secrets.OSSRH_GPG_PASSPHRASE }}'
diff --git a/build.gradle b/build.gradle
@@ -16,8 +16,8 @@ apply plugin: 'io.codearte.nexus-staging'
 
 nexusStaging {
     packageGroup = "com.wavesplatform"
-    username = whisperSonatypeUsername
-    password = whisperSonatypePassword
+    username = sonatypeUsername
+    password = sonatypePassword
     numberOfRetries = 100
     delayBetweenRetriesInMillis = 5000
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,5 @@
 sonatypeRepo=
-whisperSonatypeUsername=
-whisperSonatypePassword=
+sonatypeUsername=
+sonatypePassword=
+gpgKey=
+gpgPassphrase=
diff --git a/java/build.gradle b/java/build.gradle
@@ -48,7 +48,7 @@ dependencies {
 }
 
 signing {
-    // required { hasProperty("release") && gradle.taskGraph.hasTask("uploadArchives") }
+    useInMemoryPgpKeys(gpgKey, gpgPassphrase)
     sign configurations.archives
 }
 
@@ -58,7 +58,7 @@ uploadArchives {
         beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
 
         repository(url: sonatypeRepo) {
-            authentication(userName: whisperSonatypeUsername, password: whisperSonatypePassword)
+            authentication(userName: sonatypeUsername, password: sonatypePassword)
         }
 
         pom.project {

diff --git a/native/toolchains/linux-aarch64.toolchain b/native/toolchains/linux-aarch64.toolchain
@@ -1,2 +1,2 @@
-set(CMAKE_C_COMPILER aarch64-linux-gnu-gcc-5 CACHE STRING "C compiler" FORCE)
-set(CMAKE_CXX_COMPILER aarch64-linux-gnu-g++-5 CACHE STRING "C++ compiler" FORCE)
+set(CMAKE_C_COMPILER aarch64-linux-gnu-gcc-7 CACHE STRING "C compiler" FORCE)
+set(CMAKE_CXX_COMPILER aarch64-linux-gnu-g++-7 CACHE STRING "C++ compiler" FORCE)
diff --git a/native/toolchains/linux-x86-64.toolchain b/native/toolchains/linux-x86-64.toolchain
@@ -1,2 +1,2 @@
-set(CMAKE_C_COMPILER gcc-5 CACHE STRING "C compiler" FORCE)
-set(CMAKE_CXX_COMPILER g++-5 CACHE STRING "C++ compiler" FORCE)
+set(CMAKE_C_COMPILER gcc-7 CACHE STRING "C compiler" FORCE)
+set(CMAKE_CXX_COMPILER g++-7 CACHE STRING "C++ compiler" FORCE)
diff --git a/native/toolchains/linux-x86.toolchain b/native/toolchains/linux-x86.toolchain
@@ -1,4 +1,4 @@
-set(CMAKE_C_COMPILER gcc-5 CACHE STRING "C compiler" FORCE)
+set(CMAKE_C_COMPILER gcc-7 CACHE STRING "C compiler" FORCE)
 set(CMAKE_C_FLAGS "-m32" CACHE STRING "C compiler flags" FORCE)
-set(CMAKE_CXX_COMPILER g++-5 CACHE STRING "C++ compiler" FORCE)
+set(CMAKE_CXX_COMPILER g++-7 CACHE STRING "C++ compiler" FORCE)
 set(CMAKE_CXX_FLAGS "-m32" CACHE STRING "C++ compiler flags" FORCE)