From 122e41f20b4c676cffddfb707c0d82bff92bb147 Mon Sep 17 00:00:00 2001 From: EdwinBetanc0urt Date: Mon, 9 Dec 2024 09:58:22 -0400 Subject: [PATCH 1/3] fix: CI with public packages. --- .github/workflows/ci.yml | 4 ++-- .github/workflows/publish.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cf2260e..65cdb25 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,8 +49,8 @@ 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 }} with: gradle-version: 8.0.2 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 40fd1fe..52ebda7 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -34,8 +34,8 @@ 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 }} - name: Set Main Version From d9480ccd824b15f2bf01dd0b556998924914a2f8 Mon Sep 17 00:00:00 2001 From: EdwinBetanc0urt Date: Mon, 9 Dec 2024 10:24:12 -0400 Subject: [PATCH 2/3] add env with custom properties --- .github/workflows/ci.yml | 7 +++++-- .github/workflows/publish.yml | 3 +++ .gitignore | 6 +++++- build.gradle | 7 ++++--- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 65cdb25..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: "${{ github.actor }}" - GITHUB_DEPLOY_TOKEN: "${{ secrets.GITHUB_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 52ebda7..b767252 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -37,6 +37,9 @@ jobs: 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 diff --git a/build.gradle b/build.gradle index 8773b46..1b53f83 100644 --- a/build.gradle +++ b/build.gradle @@ -5,6 +5,7 @@ plugins { id 'application' id 'visual-studio' id 'maven-publish' + id "co.uzzu.dotenv.gradle" version "4.0.0" } group 'com.nikhilm' @@ -42,9 +43,9 @@ repositories { // Adempiere GitHub Organization url = 'https://maven.pkg.github.com/adempiere/adempiere' credentials { - // project property, system properrty, enviroment variable - username = findProperty("deployUsername") ?: System.properties['deploy.user'] ?: System.getenv("GITHUB_DEPLOY_USER") - password = findProperty("deployToken") ?: System.properties['deploy.token'] ?: System.getenv("GITHUB_DEPLOY_TOKEN") + // project property, system properrty, .env file, enviroment variable system + username = findProperty("deployUsername") ?: System.properties['deploy.user'] ?: env.GITHUB_DEPLOY_TOKEN.value ?: System.getenv("GITHUB_DEPLOY_USER") + password = findProperty("deployToken") ?: System.properties['deploy.token'] ?: env.GITHUB_DEPLOY_TOKEN.value ?: System.getenv("GITHUB_DEPLOY_TOKEN") } } } From c786b55b8c7e6b190b5601617504065fbee671c5 Mon Sep 17 00:00:00 2001 From: EdwinBetanc0urt Date: Mon, 9 Dec 2024 10:35:20 -0400 Subject: [PATCH 3/3] revert .env file changes. --- build.gradle | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 1b53f83..8773b46 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,6 @@ plugins { id 'application' id 'visual-studio' id 'maven-publish' - id "co.uzzu.dotenv.gradle" version "4.0.0" } group 'com.nikhilm' @@ -43,9 +42,9 @@ repositories { // Adempiere GitHub Organization url = 'https://maven.pkg.github.com/adempiere/adempiere' credentials { - // project property, system properrty, .env file, enviroment variable system - username = findProperty("deployUsername") ?: System.properties['deploy.user'] ?: env.GITHUB_DEPLOY_TOKEN.value ?: System.getenv("GITHUB_DEPLOY_USER") - password = findProperty("deployToken") ?: System.properties['deploy.token'] ?: env.GITHUB_DEPLOY_TOKEN.value ?: System.getenv("GITHUB_DEPLOY_TOKEN") + // project property, system properrty, enviroment variable + username = findProperty("deployUsername") ?: System.properties['deploy.user'] ?: System.getenv("GITHUB_DEPLOY_USER") + password = findProperty("deployToken") ?: System.properties['deploy.token'] ?: System.getenv("GITHUB_DEPLOY_TOKEN") } } }