diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cf2260e..2472c0e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,9 +49,12 @@ jobs: - name: Build with Gradle uses: gradle/gradle-build-action@v2 env: - GITHUB_DEPLOY_USER: "${{ secrets.DEPLOY_USER }}" - GITHUB_DEPLOY_TOKEN: "${{ secrets.DEPLOY_TOKEN }}" + GITHUB_DEPLOY_USER: ${{ github.actor }} + GITHUB_DEPLOY_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_DEPLOY_REPOSITORY: ${{ secrets.DEPLOY_REPOSITORY }} + ORG_GRADLE_PROJECT_deployUsername: ${{ secrets.DEPLOY_USER }} + ORG_GRADLE_PROJECT_deployToken: ${{ secrets.DEPLOY_TOKEN }} + ORG_GRADLE_PROJECT_deplyRepository: ${{ secrets.DEPLOY_REPOSITORY }} with: gradle-version: 8.0.2 arguments: build diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 40fd1fe..b767252 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -34,9 +34,12 @@ jobs: gradle-version: 8.0.2 arguments: createRelease env: - GITHUB_DEPLOY_USER: ${{ secrets.DEPLOY_USER }} - GITHUB_DEPLOY_TOKEN: ${{ secrets.DEPLOY_TOKEN }} + GITHUB_DEPLOY_USER: ${{ github.actor }} + GITHUB_DEPLOY_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_DEPLOY_REPOSITORY: ${{ secrets.DEPLOY_REPOSITORY }} + ORG_GRADLE_PROJECT_deployUsername: ${{ secrets.DEPLOY_USER }} + ORG_GRADLE_PROJECT_deployToken: ${{ secrets.DEPLOY_TOKEN }} + ORG_GRADLE_PROJECT_deplyRepository: ${{ secrets.DEPLOY_REPOSITORY }} - name: Set Main Version run: echo "MAIN_VERSION=${{ github.event.release.name }}" >> src/main/java/org/spin/base/version.properties diff --git a/.gitignore b/.gitignore index a9e8fe5..f113d09 100644 --- a/.gitignore +++ b/.gitignore @@ -23,5 +23,9 @@ hs_err_pid* /bin/ /.gradle/ +/libs/ +/dependences/ /build/ -*.properties \ No newline at end of file +*.properties +# skip folder dependencies +!dependencies/*.jar