From 4bb3cafead50d2a363d17fdee629b43dd4cd4ea8 Mon Sep 17 00:00:00 2001 From: "jose.pereda" Date: Sun, 31 Mar 2024 18:56:40 +0200 Subject: [PATCH] update workflows --- .github/workflows/build.yml | 11 +++++------ .github/workflows/release.yml | 12 ++++++------ gradle/include/AttachMacros.h | 2 +- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d2a2053..f2ce914 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ on: jobs: build: name: Build - runs-on: macos-10.15 + runs-on: macos-11 strategy: fail-fast: false steps: @@ -19,10 +19,11 @@ jobs: with: fetch-depth: 5 - - name: Setup Java 11 - uses: actions/setup-java@v1 + - name: Setup Java 17 + uses: actions/setup-java@v3 with: - java-version: 11 + distribution: 'temurin' + java-version: 17 - name: Grant execute permission for gradlew run: chmod +x gradlew @@ -30,14 +31,12 @@ jobs: - name: Build project run: | export ANDROID_SDK=$ANDROID_HOME - export ANDROID_NDK=$ANDROID_HOME/ndk-bundle ./gradlew -i nativeBuild - name: Deploy Snapshot if: github.ref == 'refs/heads/master' run: | export ANDROID_SDK=$ANDROID_HOME - export ANDROID_NDK=$ANDROID_HOME/ndk-bundle ./gradlew publish -PgluonNexusDeployUsername=$NEXUS_DEPLOY_USERNAME -PgluonNexusDeployPassword=$NEXUS_DEPLOY_PASSWORD env: NEXUS_DEPLOY_USERNAME: ${{ secrets.NEXUS_DEPLOY_USERNAME }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9eb63b8..24c1b4a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,7 +7,7 @@ on: jobs: build: name: Deploy - runs-on: macos-10.15 + runs-on: macos-11 steps: - name: Checkout uses: actions/checkout@v2 @@ -15,10 +15,11 @@ jobs: fetch-depth: 5 persist-credentials: false - - name: Setup Java 11 - uses: actions/setup-java@v1 + - name: Setup Java 17 + uses: actions/setup-java@v3 with: - java-version: 11 + distribution: 'temurin' + java-version: 17 - name: Grant execute permission for gradlew run: chmod +x gradlew @@ -26,7 +27,6 @@ jobs: - name: Deploy Release run: | export ANDROID_SDK=$ANDROID_HOME - export ANDROID_NDK=$ANDROID_HOME/ndk-bundle ./gradlew publish -PgluonNexusDeployUsername=$NEXUS_DEPLOY_USERNAME -PgluonNexusDeployPassword=$NEXUS_DEPLOY_PASSWORD env: NEXUS_DEPLOY_USERNAME: ${{ secrets.NEXUS_DEPLOY_USERNAME }} @@ -44,4 +44,4 @@ jobs: git commit gradle.properties -m "Prepare development of $newVersion" git push https://gluon-bot:$PAT@github.com/$GITHUB_REPOSITORY HEAD:master env: - PAT: ${{ secrets.PAT }} \ No newline at end of file + PAT: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/gradle/include/AttachMacros.h b/gradle/include/AttachMacros.h index ac19668..86245bc 100644 --- a/gradle/include/AttachMacros.h +++ b/gradle/include/AttachMacros.h @@ -43,7 +43,7 @@ static __inline__ void AttachLog(const char *file, int lineNumber, const char *f [dateFormatter setTimeZone:[NSTimeZone systemTimeZone]]; } fprintf(stderr, "[AttachLog] %s %s:%3d %s\n", [[dateFormatter stringFromDate:[NSDate date]] UTF8String], funcName, lineNumber, [formattedMessage UTF8String]); - [formattedMessage release]; +// [formattedMessage release]; } #define AttachLog(MSG, ...) AttachLog(__FILE__, __LINE__, __PRETTY_FUNCTION__, MSG, ## __VA_ARGS__ )