Skip to content

Commit

Permalink
Merge pull request #226 from navikt/dev
Browse files Browse the repository at this point in the history
Tc-117 bytt action for release, bump common
  • Loading branch information
klaramargrethehelgemo authored Sep 7, 2022
2 parents 48e5b0f + abb8269 commit c62a7b4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 12 deletions.
15 changes: 4 additions & 11 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,6 @@ jobs:
CLUSTER: dev-fss
RESOURCE: nais-dev.yaml
VAR: version=${{ env.IMAGE_TAG }}
- name: Create release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: release/dev@${{ env.IMAGE_TAG }}
release_name: Release to dev
prerelease: true

deploy-prod:
name: Deploy application to prod
Expand All @@ -92,10 +84,11 @@ jobs:
RESOURCE: nais-prod.yaml
VAR: version=${{ env.IMAGE_TAG }}
- name: Create release
uses: actions/create-release@v1
uses: softprops/action-gh-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
name: Release to prod
tag_name: release/prod@${{ env.IMAGE_TAG }}
release_name: Release to prod
prerelease: false
target_commitish: master

2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<properties>
<java.version>11</java.version>
<common.version>2.2022.07.01_07.12-6a0864fa6938</common.version>
<common.version>2.2022.09.02_11.04-2530dd139a0a</common.version>
<testcontainers.version>1.17.2</testcontainers.version>
<tjenestespesifikasjoner.version>1.2019.09.25-00.21-49b69f0625e0</tjenestespesifikasjoner.version>
</properties>
Expand Down

0 comments on commit c62a7b4

Please sign in to comment.