diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index ed35d37..669ab5d 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -6,9 +6,7 @@ name: Maven Publish on: workflow_call: secrets: - AWS_CA_USER: - required: true - AWS_CA_PASSWORD: + AWS_CA_TOKEN: required: true MVN_SETTINGS_XML: required: true @@ -24,10 +22,6 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Print actor - run: | - echo "Actor: ${{ github.actor }}" - - name: Set up Maven uses: stCarolas/setup-maven@v5 with: @@ -43,11 +37,8 @@ jobs: - name: Create Maven settings run: | echo -e "$SETTINGS_XML" > ~/.m2/settings.xml - cat ~/.m2/settings.xml - echo "CODEARTIFACT_AUTH_TOKEN: $CODEARTIFACT_AUTH_TOKEN" env: SETTINGS_XML: ${{ secrets.MVN_SETTINGS_XML }} - CODEARTIFACT_AUTH_TOKEN: ${{ secrets.AWS_CA_TOKEN }} - name: Build with Maven run: | @@ -58,7 +49,5 @@ jobs: mvn deploy --file pom.xml -DrepositoryId=pravila--pravila-maven env: GITHUB_TOKEN: ${{ github.token }} - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_CA_USER }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_CA_PASSWORD }} CODEARTIFACT_AUTH_TOKEN: ${{ secrets.AWS_CA_TOKEN }} diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml index 62d7ac6..81d0772 100644 --- a/.github/workflows/maven-release.yml +++ b/.github/workflows/maven-release.yml @@ -6,9 +6,7 @@ name: Maven Release on: workflow_call: secrets: - AWS_CA_USER: - required: true - AWS_CA_PASSWORD: + AWS_CA_TOKEN: required: true SSH_PRIVATE_KEY: required: true @@ -26,13 +24,6 @@ jobs: steps: - uses: actions/checkout@v4 - - name : Print version - run: | - echo "maven-release version 1" - echo "repo url: $REPO_URL" - env: - REPO_URL: scm:git:git@devops.pravilanovait.hr:${{ github.repository }} - - name: Set up Maven uses: stCarolas/setup-maven@v5 with: @@ -58,11 +49,8 @@ jobs: - name: Create Maven settings run: | echo -e "$SETTINGS_XML" > ~/.m2/settings.xml - cat ~/.m2/settings.xml - echo "CODEARTIFACT_AUTH_TOKEN: $CODEARTIFACT_AUTH_TOKEN" env: SETTINGS_XML: ${{ secrets.MVN_SETTINGS_XML }} - CODEARTIFACT_AUTH_TOKEN: ${{ secrets.AWS_CA_TOKEN }} - name: Maven release run: | @@ -70,7 +58,5 @@ jobs: mvn org.apache.maven.plugins:maven-release-plugin:3.1.0:perform -B -DrepositoryId=pravila--pravila-maven -DconnectionUrl=$REPO_URL env: GITHUB_TOKEN: ${{ github.token }} - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_CA_USER }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_CA_PASSWORD }} REPO_URL: scm:git:git@devops.pravilanovait.hr:${{ github.repository }} CODEARTIFACT_AUTH_TOKEN: ${{ secrets.AWS_CA_TOKEN }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 7fd5abe..8378bd1 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -11,9 +11,7 @@ name: Java CI with Maven on: workflow_call: secrets: - AWS_CA_USER: - required: true - AWS_CA_PASSWORD: + AWS_CA_TOKEN: required: true jobs: build: @@ -38,11 +36,8 @@ jobs: - name: Create Maven settings run: | echo -e "$SETTINGS_XML" > ~/.m2/settings.xml - cat ~/.m2/settings.xml - echo "CODEARTIFACT_AUTH_TOKEN: $CODEARTIFACT_AUTH_TOKEN" env: SETTINGS_XML: ${{ vars.MVN_SETTINGS_XML }} - CODEARTIFACT_AUTH_TOKEN: ${{ secrets.AWS_CA_TOKEN }} - name: Build with Maven run: mvn -B clean package