Removing aws cli and switch to AWS_CA_TOKEN

This commit is contained in:
Marko Frankovic 2025-03-05 08:25:04 +01:00
parent 3a1e965489
commit 7055caeb06
3 changed files with 3 additions and 33 deletions

View File

@ -6,9 +6,7 @@ name: Maven Publish
on: on:
workflow_call: workflow_call:
secrets: secrets:
AWS_CA_USER: AWS_CA_TOKEN:
required: true
AWS_CA_PASSWORD:
required: true required: true
MVN_SETTINGS_XML: MVN_SETTINGS_XML:
required: true required: true
@ -24,10 +22,6 @@ jobs:
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Print actor
run: |
echo "Actor: ${{ github.actor }}"
- name: Set up Maven - name: Set up Maven
uses: stCarolas/setup-maven@v5 uses: stCarolas/setup-maven@v5
with: with:
@ -43,11 +37,8 @@ jobs:
- name: Create Maven settings - name: Create Maven settings
run: | run: |
echo -e "$SETTINGS_XML" > ~/.m2/settings.xml echo -e "$SETTINGS_XML" > ~/.m2/settings.xml
cat ~/.m2/settings.xml
echo "CODEARTIFACT_AUTH_TOKEN: $CODEARTIFACT_AUTH_TOKEN"
env: env:
SETTINGS_XML: ${{ secrets.MVN_SETTINGS_XML }} SETTINGS_XML: ${{ secrets.MVN_SETTINGS_XML }}
CODEARTIFACT_AUTH_TOKEN: ${{ secrets.AWS_CA_TOKEN }}
- name: Build with Maven - name: Build with Maven
run: | run: |
@ -58,7 +49,5 @@ jobs:
mvn deploy --file pom.xml -DrepositoryId=pravila--pravila-maven mvn deploy --file pom.xml -DrepositoryId=pravila--pravila-maven
env: env:
GITHUB_TOKEN: ${{ github.token }} 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 }} CODEARTIFACT_AUTH_TOKEN: ${{ secrets.AWS_CA_TOKEN }}

View File

@ -6,9 +6,7 @@ name: Maven Release
on: on:
workflow_call: workflow_call:
secrets: secrets:
AWS_CA_USER: AWS_CA_TOKEN:
required: true
AWS_CA_PASSWORD:
required: true required: true
SSH_PRIVATE_KEY: SSH_PRIVATE_KEY:
required: true required: true
@ -26,13 +24,6 @@ jobs:
steps: steps:
- uses: actions/checkout@v4 - 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 - name: Set up Maven
uses: stCarolas/setup-maven@v5 uses: stCarolas/setup-maven@v5
with: with:
@ -58,11 +49,8 @@ jobs:
- name: Create Maven settings - name: Create Maven settings
run: | run: |
echo -e "$SETTINGS_XML" > ~/.m2/settings.xml echo -e "$SETTINGS_XML" > ~/.m2/settings.xml
cat ~/.m2/settings.xml
echo "CODEARTIFACT_AUTH_TOKEN: $CODEARTIFACT_AUTH_TOKEN"
env: env:
SETTINGS_XML: ${{ secrets.MVN_SETTINGS_XML }} SETTINGS_XML: ${{ secrets.MVN_SETTINGS_XML }}
CODEARTIFACT_AUTH_TOKEN: ${{ secrets.AWS_CA_TOKEN }}
- name: Maven release - name: Maven release
run: | 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 mvn org.apache.maven.plugins:maven-release-plugin:3.1.0:perform -B -DrepositoryId=pravila--pravila-maven -DconnectionUrl=$REPO_URL
env: env:
GITHUB_TOKEN: ${{ github.token }} 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 }} REPO_URL: scm:git:git@devops.pravilanovait.hr:${{ github.repository }}
CODEARTIFACT_AUTH_TOKEN: ${{ secrets.AWS_CA_TOKEN }} CODEARTIFACT_AUTH_TOKEN: ${{ secrets.AWS_CA_TOKEN }}

View File

@ -11,9 +11,7 @@ name: Java CI with Maven
on: on:
workflow_call: workflow_call:
secrets: secrets:
AWS_CA_USER: AWS_CA_TOKEN:
required: true
AWS_CA_PASSWORD:
required: true required: true
jobs: jobs:
build: build:
@ -38,11 +36,8 @@ jobs:
- name: Create Maven settings - name: Create Maven settings
run: | run: |
echo -e "$SETTINGS_XML" > ~/.m2/settings.xml echo -e "$SETTINGS_XML" > ~/.m2/settings.xml
cat ~/.m2/settings.xml
echo "CODEARTIFACT_AUTH_TOKEN: $CODEARTIFACT_AUTH_TOKEN"
env: env:
SETTINGS_XML: ${{ vars.MVN_SETTINGS_XML }} SETTINGS_XML: ${{ vars.MVN_SETTINGS_XML }}
CODEARTIFACT_AUTH_TOKEN: ${{ secrets.AWS_CA_TOKEN }}
- name: Build with Maven - name: Build with Maven
run: mvn -B clean package run: mvn -B clean package