diff --git a/.forgejo/workflows/linux.yaml b/.forgejo/workflows/linux.yaml index 7130add4..9b23359e 100644 --- a/.forgejo/workflows/linux.yaml +++ b/.forgejo/workflows/linux.yaml @@ -57,4 +57,4 @@ jobs: - name: Upload artifacts run: | tar -czf linux.tar.gz release - curl -v -u ${{ secrets.MAVEN_USER }}:${{ secrets.MAVEN_PASSWORD }} --upload-file linux.tar.gz ${{ secrets.MAVEN_HOST }}/repository/grim-ci-artifacts/linux.tar.gz \ No newline at end of file + curl -v -u ${{ secrets.MAVEN_USER }}:${{ secrets.MAVEN_PASSWORD }} --upload-file linux.tar.gz ${{ secrets.MAVEN_HOST }}/repository/grim-ci-artifacts/${{ forgejo.repository }}/linux.tar.gz \ No newline at end of file diff --git a/.forgejo/workflows/macos.yaml b/.forgejo/workflows/macos.yaml index 6bd1d88e..87e86048 100644 --- a/.forgejo/workflows/macos.yaml +++ b/.forgejo/workflows/macos.yaml @@ -49,4 +49,4 @@ jobs: - name: Upload artifacts run: | tar -czf macos.tar.gz release - curl -v -u ${{ secrets.MAVEN_USER }}:${{ secrets.MAVEN_PASSWORD }} --upload-file macos.tar.gz ${{ secrets.MAVEN_HOST }}/repository/grim-ci-artifacts/macos.tar.gz \ No newline at end of file + curl -v -u ${{ secrets.MAVEN_USER }}:${{ secrets.MAVEN_PASSWORD }} --upload-file macos.tar.gz ${{ secrets.MAVEN_HOST }}/repository/grim-ci-artifacts/${{ forgejo.repository }}/macos.tar.gz \ No newline at end of file diff --git a/.forgejo/workflows/release.yaml b/.forgejo/workflows/release.yaml index 86cf09f4..e48d3ccb 100644 --- a/.forgejo/workflows/release.yaml +++ b/.forgejo/workflows/release.yaml @@ -13,6 +13,8 @@ jobs: runs-on: ubuntu outputs: v: ${{ steps.version.outputs.v }} + exists: ${{ steps.check.outputs.exists }} + last_tag: ${{ steps.check_prev.outputs.last_tag }} steps: - uses: actions/checkout@v6 with: @@ -73,7 +75,7 @@ jobs: release_name: "${{ forgejo.ref_name }}-dev" android_libs: - if: ${{ forgejo.ref_type == 'branch' || needs.check.outputs.exists == 'false' }} + if: ${{ forgejo.ref_type == 'branch' || needs.version.outputs.exists == 'false' }} runs-on: ubuntu needs: version steps: @@ -96,10 +98,10 @@ jobs: run: | cd android/app/src/main tar -czf jniLibs.tar.gz jniLibs - curl -v -u ${{ secrets.MAVEN_USER }}:${{ secrets.MAVEN_PASSWORD }} --upload-file jniLibs.tar.gz ${{ secrets.MAVEN_HOST }}/repository/grim-ci-artifacts/jniLibs.tar.gz + curl -v -u ${{ secrets.MAVEN_USER }}:${{ secrets.MAVEN_PASSWORD }} --upload-file jniLibs.tar.gz ${{ secrets.MAVEN_HOST }}/repository/grim-ci-artifacts/${{ forgejo.repository }}/jniLibs.tar.gz android_release: - if: ${{ forgejo.ref_type == 'branch' || needs.check.outputs.exists == 'false' }} + if: ${{ forgejo.ref_type == 'branch' || needs.version.outputs.exists == 'false' }} runs-on: ubuntu-android needs: [version, android_libs] steps: @@ -117,7 +119,7 @@ jobs: - name: Download artifacts run: | cd android/app/src/main - curl -o jniLibs.tar.gz -u ${{ secrets.MAVEN_USER }}:${{ secrets.MAVEN_PASSWORD }} ${{ secrets.MAVEN_HOST }}/repository/grim-ci-artifacts/jniLibs.tar.gz + curl -o jniLibs.tar.gz -u ${{ secrets.MAVEN_USER }}:${{ secrets.MAVEN_PASSWORD }} ${{ secrets.MAVEN_HOST }}/repository/grim-ci-artifacts/${{ forgejo.repository }}/jniLibs.tar.gz tar -xzf jniLibs.tar.gz rm jniLibs.tar.gz - name: Setup build @@ -168,10 +170,10 @@ jobs: mkdir release mv android/grim* release tar -czf android.tar.gz release - curl -v -u ${{ secrets.MAVEN_USER }}:${{ secrets.MAVEN_PASSWORD }} --upload-file android.tar.gz ${{ secrets.MAVEN_HOST }}/repository/grim-ci-artifacts/android.tar.gz + curl -v -u ${{ secrets.MAVEN_USER }}:${{ secrets.MAVEN_PASSWORD }} --upload-file android.tar.gz ${{ secrets.MAVEN_HOST }}/repository/grim-ci-artifacts/${{ forgejo.repository }}/android.tar.gz linux: - if: ${{ forgejo.ref_type == 'branch' || needs.check.outputs.exists == 'false' }} + if: ${{ forgejo.ref_type == 'branch' || needs.version.outputs.exists == 'false' }} runs-on: ubuntu needs: [version, android_libs, android_release] uses: ./.forgejo/workflows/linux.yaml @@ -184,7 +186,7 @@ jobs: MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} macos: - if: ${{ forgejo.ref_type == 'branch' || needs.check.outputs.exists == 'false' }} + if: ${{ forgejo.ref_type == 'branch' || needs.version.outputs.exists == 'false' }} runs-on: ubuntu needs: [version, android_libs, android_release, linux] uses: ./.forgejo/workflows/macos.yaml @@ -197,7 +199,7 @@ jobs: MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} windows: - if: ${{ forgejo.ref_type == 'branch' || needs.check.outputs.exists == 'false' }} + if: ${{ forgejo.ref_type == 'branch' || needs.version.outputs.exists == 'false' }} runs-on: ubuntu needs: [version, android_libs, android_release, linux, macos] uses: ./.forgejo/workflows/windows.yaml @@ -210,22 +212,22 @@ jobs: MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} release: - if: ${{ forgejo.ref_type == 'branch' || needs.check.outputs.exists == 'false' }} + if: ${{ forgejo.ref_type == 'branch' || needs.version.outputs.exists == 'false' }} runs-on: ubuntu needs: [version, android_libs, android_release, linux, macos, windows] steps: - name: Download All Artifacts run: | - curl -o android.tar.gz -u ${{ secrets.MAVEN_USER }}:${{ secrets.MAVEN_PASSWORD }} ${{ secrets.MAVEN_HOST }}/repository/grim-ci-artifacts/android.tar.gz + curl -o android.tar.gz -u ${{ secrets.MAVEN_USER }}:${{ secrets.MAVEN_PASSWORD }} ${{ secrets.MAVEN_HOST }}/repository/grim-ci-artifacts/${{ forgejo.repository }}/android.tar.gz tar -xzf android.tar.gz rm android.tar.gz - curl -o linux.tar.gz -u ${{ secrets.MAVEN_USER }}:${{ secrets.MAVEN_PASSWORD }} ${{ secrets.MAVEN_HOST }}/repository/grim-ci-artifacts/linux.tar.gz + curl -o linux.tar.gz -u ${{ secrets.MAVEN_USER }}:${{ secrets.MAVEN_PASSWORD }} ${{ secrets.MAVEN_HOST }}/repository/grim-ci-artifacts/${{ forgejo.repository }}/linux.tar.gz tar -xzf linux.tar.gz rm linux.tar.gz - curl -o macos.tar.gz -u ${{ secrets.MAVEN_USER }}:${{ secrets.MAVEN_PASSWORD }} ${{ secrets.MAVEN_HOST }}/repository/grim-ci-artifacts/macos.tar.gz + curl -o macos.tar.gz -u ${{ secrets.MAVEN_USER }}:${{ secrets.MAVEN_PASSWORD }} ${{ secrets.MAVEN_HOST }}/repository/grim-ci-artifacts/${{ forgejo.repository }}/macos.tar.gz tar -xzf macos.tar.gz rm macos.tar.gz - curl -o windows.tar.gz -u ${{ secrets.MAVEN_USER }}:${{ secrets.MAVEN_PASSWORD }} ${{ secrets.MAVEN_HOST }}/repository/grim-ci-artifacts/windows.tar.gz + curl -o windows.tar.gz -u ${{ secrets.MAVEN_USER }}:${{ secrets.MAVEN_PASSWORD }} ${{ secrets.MAVEN_HOST }}/repository/grim-ci-artifacts/${{ forgejo.repository }}/windows.tar.gz tar -xzf windows.tar.gz rm windows.tar.gz - name: Upload release to Forgejo diff --git a/.forgejo/workflows/windows.yaml b/.forgejo/workflows/windows.yaml index 9b619e80..2a5371e8 100644 --- a/.forgejo/workflows/windows.yaml +++ b/.forgejo/workflows/windows.yaml @@ -45,4 +45,4 @@ jobs: - name: Upload artifacts run: | tar -czf windows.tar.gz release - curl -v -u ${{ secrets.MAVEN_USER }}:${{ secrets.MAVEN_PASSWORD }} --upload-file windows.tar.gz ${{ secrets.MAVEN_HOST }}/repository/grim-ci-artifacts/windows.tar.gz \ No newline at end of file + curl -v -u ${{ secrets.MAVEN_USER }}:${{ secrets.MAVEN_PASSWORD }} --upload-file windows.tar.gz ${{ secrets.MAVEN_HOST }}/repository/grim-ci-artifacts/${{ forgejo.repository }}/windows.tar.gz \ No newline at end of file