Oppdater github workflow

navikt · Jan 9, 2024 · ddfcbd7 · ddfcbd7
1 parent fd286cb
commit ddfcbd7
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 8 deletions.
diff --git a/.github/workflows/build-deploy-bidrag-domene.yml b/.github/workflows/build-deploy-bidrag-domene.yml
@@ -3,8 +3,6 @@ on:
   push:
     paths:
       - "bidrag-domene/**"
-  pull_request:
-    types: [closed]
 
 permissions:
   contents: "read"

diff --git a/.github/workflows/build-deploy-bidrag-transport.yml b/.github/workflows/build-deploy-bidrag-transport.yml
@@ -3,8 +3,6 @@ on:
   push:
     paths:
       - "bidrag-transport/**"
-  pull_request:
-    types: [closed]
 
 permissions:
   contents: "read"

diff --git a/.github/workflows/build_and_release_package.yml b/.github/workflows/build_and_release_package.yml
@@ -34,7 +34,7 @@ jobs:
   release:
     name: Release package
     needs: build-artifact
-    if: github.base_ref == 'main'
+    if: github.base_ref == 'main' || github.ref == 'refs/heads/main'
     uses: ./.github/workflows/release_package.yml
     with:
       package-name: ${{inputs.package-name}}

diff --git a/.github/workflows/release_package.yml b/.github/workflows/release_package.yml
@@ -23,8 +23,8 @@ jobs:
             export VERSION=${GIT_COMMIT_DATE}
             echo "VERSION=${GIT_COMMIT_DATE}" >> $GITHUB_ENV
             echo "Setting version $VERSION"
-            mvn --settings versions:set -DnewVersion="$VERSION" --pl ${{inputs.package-name}} --am
-            mvn --settings versions:commit --pl ${{inputs.package-name}} --am
+            mvn versions:set -DnewVersion="$VERSION" --pl ${{inputs.package-name}} --am
+            mvn versions:commit --pl ${{inputs.package-name}} --am
             git tag -a "${VERSION}" -m "Version ${VERSION}"
             git push origin "${VERSION}"
         - name: Deploy to Github Package

diff --git a/bidrag-transport/README.md b/bidrag-transport/README.md
@@ -1,3 +1,3 @@
 # bidrag-tranport
 Transportobjekter for team bidrag
-test
+test2