Skip to content

Commit 14f5686

Browse files
author
Dependency Admin
committed
Automated update for dependency workflow file
1 parent f496f4d commit 14f5686

File tree

1 file changed

+26
-30
lines changed

1 file changed

+26
-30
lines changed

.github/workflows/verify_distributed_dependencies.yaml

Lines changed: 26 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -17,58 +17,54 @@ jobs:
1717
check-validity-and-merge:
1818
runs-on: ubuntu-latest
1919
steps:
20-
- name: 'Sjekk ut branch'
21-
uses: 'actions/checkout@v3'
20+
- name: Sjekk ut branch
21+
uses: 'actions/checkout@v4'
2222
with:
2323
fetch-depth: 2
2424

25-
- name: Setup java
26-
uses: actions/setup-java@v1
25+
- name: Sett opp java
26+
uses: actions/setup-java@v4
2727
with:
28-
java-version: '17.x'
28+
java-version: 17
29+
distribution: 'temurin'
2930

30-
- name: 'Bygg og kjør tester for å sjekke at nye versjoner er kompatible'
31-
run: |
32-
./gradlew clean build
33-
env:
34-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
31+
- name: Sett opp gradle
32+
uses: gradle/actions/setup-gradle@v3
3533

36-
- name: 'Bygg, tag og push Docker image'
37-
run: |
38-
APP_NAME=$(echo $GITHUB_REPOSITORY | rev | cut -f1 -d"/" | rev )
39-
TAG_NAME="$(git log -1 --pretty='%ad' --date=format:'%Y%m%d%H%M%S')-$(git log -1 --pretty='%h')"
40-
IMAGE_NAME="ghcr.io/$GITHUB_REPOSITORY/$APP_NAME:$TAG_NAME"
41-
echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_REPOSITORY --password-stdin
42-
docker build --tag $IMAGE_NAME .
43-
docker push $IMAGE_NAME
44-
echo "IMAGE=$IMAGE_NAME" >> $GITHUB_ENV
34+
- name: Bygg og kjør tester for å sjekke at nye versjoner er kompatible
35+
run: ./gradlew build
4536

46-
- name: 'Sjekk om deploy til dev-gcp er mulig'
37+
- name: Build og push docker-image
38+
uses: nais/docker-build-push@v0
39+
id: docker-build-push
40+
with:
41+
team: min-side
42+
identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
43+
project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
44+
45+
- name: Sjekk om deploy til dev-gcp er mulig
4746
run: echo "CAN_DEPLOY_DEV=$([[ -f ./nais/dev-gcp/nais.yaml ]] && echo 'true' || echo 'false')" >> $GITHUB_ENV
4847

49-
- name: 'Deploy-er til dev-gcp for å sjekke viability'
48+
- name: Deploy-er til dev-gcp for å sjekke viability
5049
if: env.CAN_DEPLOY_DEV == 'true'
51-
uses: 'nais/deploy/actions/deploy@v1'
50+
uses: nais/deploy/actions/deploy@v2
5251
env:
5352
REF: ${{ github.sha }}
54-
APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
5553
CLUSTER: dev-gcp
5654
RESOURCE: ./nais/dev-gcp/nais.yaml
57-
VAR: version=${{ env.IMAGE }}
55+
VAR: version=${{ steps.docker-build-push.outputs.image }}
5856
PRINT_PAYLOAD: true
5957

60-
- name: 'Sjekk om deploy til prod-gcp er mulig'
58+
- name: Sjekk om deploy til prod-gcp er mulig
6159
run: echo "CAN_DEPLOY_PROD=$([[ -f ./nais/prod-gcp/nais.yaml ]] && echo 'true' || echo 'false')" >> $GITHUB_ENV
6260

63-
- name: 'Deploy-er til prod-gcp for å sjekke viability'
61+
- name: Deploy-er til prod-gcp for å sjekke viability
6462
if: env.CAN_DEPLOY_PROD == 'true'
65-
uses: 'nais/deploy/actions/deploy@v1'
63+
uses: nais/deploy/actions/deploy@v2
6664
env:
67-
REF: ${{ github.sha }}
68-
APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
6965
CLUSTER: prod-gcp
7066
RESOURCE: ./nais/prod-gcp/nais.yaml
71-
VAR: version=${{ env.IMAGE }}
67+
VAR: version=${{ steps.docker-build-push.outputs.image }}
7268
PRINT_PAYLOAD: true
7369

7470
- name: 'Merge kode fra branch og push til main'

0 commit comments

Comments
 (0)