Skip to content

Commit

Permalink
Fix deploy (#1114)
Browse files Browse the repository at this point in the history
* Fix: Deploy parent pom.xml også

* Komprimer release skript.
  • Loading branch information
mrsladek authored Mar 9, 2023
1 parent aefd34a commit b1b5cd3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 75 deletions.
36 changes: 6 additions & 30 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,9 @@ on:

jobs:
release:
name: Release
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/[email protected]

- name: Create maven .m2 setting
uses: whelk-io/maven-settings-xml-action@v21
with:
repositories: '[{"id": "github", "name": "github", "url": "https://maven.pkg.github.com/${{ github.repository }}",
"releases": { "enabled": "true" }, "snapshots": { "enabled": "false" }}]'
servers: '[{ "id": "github", "username": "${{ github.actor }}", "password": "${{ secrets.GH_ACCESS_TOKEN}}" }]'
output_file: settings.xml

- name: Set up JDK-17 with cache
uses: actions/setup-java@v3
with:
java-version: 17
distribution: 'temurin'
cache: 'maven'

- name: Set up Maven
uses: stCarolas/[email protected]
with:
maven-version: 3.8.7

- name: Publish artifacts
run: |
mvn -B -s settings.xml versions:set -DnewVersion=${{ github.event.release.tag_name }}
mvn deploy -s settings.xml -e -B -am -pl model,kontrakter -DtrimStackTrace=false -Dfile.encoding=UTF-8 -DdeployAtEnd=true
name: Feature
uses: navikt/fp-gha-workflows/.github/workflows/release-feature.yml@main
with:
release-version: ${{ github.event.release.tag_name }}
mvn-projects: '-am -pl model,kontrakter'
secrets: inherit
13 changes: 0 additions & 13 deletions .github/workflows/release_ny.yml

This file was deleted.

32 changes: 0 additions & 32 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -509,34 +509,6 @@
</pluginManagement>

<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<configuration>
<flattenMode>bom</flattenMode>
<flattenedPomFilename>.flattened</flattenedPomFilename>
</configuration>
<executions>
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jboss.jandex</groupId>
<artifactId>jandex-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
Expand All @@ -551,10 +523,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
</plugins>
</build>

Expand Down

0 comments on commit b1b5cd3

Please sign in to comment.