Skip to content

Commit

Permalink
Merge pull request #150 from vitruv-tools/prepare-release/3.1.0
Browse files Browse the repository at this point in the history
Prepare Release 3.1.0
  • Loading branch information
larsk21 authored Dec 3, 2024
2 parents 0f89a1a + 43bc481 commit 56de5d6
Show file tree
Hide file tree
Showing 18 changed files with 123 additions and 39 deletions.
24 changes: 24 additions & 0 deletions .github/prepare-release
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/bin/sh

if [ $# -lt 2 ];
then
echo "usage: $0 <release-version> <new-snapshot-version>" >&2
echo "" >&2
echo "release-version : Version of the next release, e.g., 3.1.0" >&2
echo "new-snapshot-version: Version of the upcoming nightly releases without the -SNAPSHOT suffix, e.g., 3.2.0" >&2
return 1
fi

git switch -C prepare-release/$1 || exit 1

set_version_and_commit() {
./mvnw versions:set -DnewVersion=$1 -DgenerateBackupPoms=false || return 1

git add pom.xml || return 1
git add "**/pom.xml" 2> /dev/null

git commit -m "$2" || return 1
}

set_version_and_commit "$1" "[Release] Version $1"
set_version_and_commit "$2-SNAPSHOT" "[Release] Update version to $2-SNAPSHOT"
73 changes: 73 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
name: Release

# workflow triggers
on:
# manually
workflow_dispatch:
# releases
release:
types: [published]

jobs:
verify:
name: Verify build on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: true
matrix:
os: [ubuntu-latest, windows-latest, macOS-latest]

steps:
- name: Checkout repository
uses: actions/[email protected]

- name: Setup Java and Maven cache
uses: actions/[email protected]
with:
distribution: 'temurin'
java-version: '17'
check-latest: true
cache: 'maven'

- name: Verify build
run: >
./mvnw clean verify
--batch-mode
--update-snapshots
--no-transfer-progress
release:
name: Release
runs-on: ubuntu-latest
needs: [verify]
strategy:
fail-fast: true

steps:
- name: Checkout repository
uses: actions/[email protected]

- name: Setup Java and Maven cache
uses: actions/[email protected]
with:
distribution: 'temurin'
java-version: '17'
check-latest: true
cache: 'maven'
server-id: ossrh
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
gpg-private-key: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
gpg-passphrase: MAVEN_GPG_PASSPHRASE

- name: Deploy to staging and release
run: >
./mvnw clean deploy -P release
-DskipTests
--batch-mode
--update-snapshots
--no-transfer-progress
env:
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
2 changes: 1 addition & 1 deletion common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>tools.vitruv</groupId>
<artifactId>tools.vitruv.dsls</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
</parent>

<artifactId>tools.vitruv.dsls.common</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion commonalities/language/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>tools.vitruv</groupId>
<artifactId>tools.vitruv.dsls.commonalities</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
</parent>

<artifactId>tools.vitruv.dsls.commonalities.language</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion commonalities/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>tools.vitruv</groupId>
<artifactId>tools.vitruv.dsls</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
</parent>

<artifactId>tools.vitruv.dsls.commonalities</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion commonalities/runtime.operators/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>tools.vitruv</groupId>
<artifactId>tools.vitruv.dsls.commonalities</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
</parent>

<artifactId>tools.vitruv.dsls.commonalities.runtime.operators</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion commonalities/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>tools.vitruv</groupId>
<artifactId>tools.vitruv.dsls.commonalities</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
</parent>

<artifactId>tools.vitruv.dsls.commonalities.runtime</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion commonalities/testutils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>tools.vitruv</groupId>
<artifactId>tools.vitruv.dsls.commonalities</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
</parent>

<artifactId>tools.vitruv.dsls.commonalities.testutils</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion demo/familiespersons/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>tools.vitruv</groupId>
<artifactId>tools.vitruv.dsls.demo</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
</parent>

<artifactId>tools.vitruv.dsls.demo.familiespersons</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion demo/insurancefamilies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>tools.vitruv</groupId>
<artifactId>tools.vitruv.dsls.demo</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
</parent>

<artifactId>tools.vitruv.dsls.demo.insurancefamilies</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion demo/insurancepersons/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>tools.vitruv</groupId>
<artifactId>tools.vitruv.dsls.demo</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
</parent>

<artifactId>tools.vitruv.dsls.demo.insurancepersons</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>tools.vitruv</groupId>
<artifactId>tools.vitruv.dsls</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
</parent>

<artifactId>tools.vitruv.dsls.demo</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion demo/sdq-demo-metamodels-wrapper/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>tools.vitruv</groupId>
<artifactId>tools.vitruv.dsls.demo</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
</parent>

<artifactId>tools.vitruv.dsls.demo.sdq-demo-metamodels-wrapper</artifactId>
Expand Down
35 changes: 11 additions & 24 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<!-- Project Information -->
<artifactId>tools.vitruv.dsls</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Vitruv Consistency DSLs</name>
Expand Down Expand Up @@ -76,19 +76,6 @@
</snapshots>
</repository>

<!-- allow snapshots -->
<repository>
<id>ossrh-snapshots</id>
<name>OSSRH Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
</repository>

<!-- for p2 dependencies, `groupId` specifies the repository -->
<repository>
<id>emf-compare</id>
Expand Down Expand Up @@ -123,47 +110,47 @@
<dependency>
<groupId>tools.vitruv</groupId>
<artifactId>tools.vitruv.change.atomic</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>tools.vitruv</groupId>
<artifactId>tools.vitruv.change.correspondence</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>tools.vitruv</groupId>
<artifactId>tools.vitruv.change.composite</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>tools.vitruv</groupId>
<artifactId>tools.vitruv.change.interaction</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>tools.vitruv</groupId>
<artifactId>tools.vitruv.change.propagation</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>tools.vitruv</groupId>
<artifactId>tools.vitruv.change.testutils.integration</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>tools.vitruv</groupId>
<artifactId>tools.vitruv.change.testutils.core</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>tools.vitruv</groupId>
<artifactId>tools.vitruv.change.testutils.metamodels</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>tools.vitruv</groupId>
<artifactId>tools.vitruv.change.utils</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.0</version>
</dependency>

<!-- external dependencies -->
Expand Down Expand Up @@ -215,7 +202,7 @@
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>ecj</artifactId>
<version>3.39.0</version>
<version>3.40.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
Expand Down
2 changes: 1 addition & 1 deletion reactions/language/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>tools.vitruv</groupId>
<artifactId>tools.vitruv.dsls.reactions</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
</parent>

<artifactId>tools.vitruv.dsls.reactions.language</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion reactions/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>tools.vitruv</groupId>
<artifactId>tools.vitruv.dsls</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
</parent>

<artifactId>tools.vitruv.dsls.reactions</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion reactions/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>tools.vitruv</groupId>
<artifactId>tools.vitruv.dsls.reactions</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
</parent>

<artifactId>tools.vitruv.dsls.reactions.runtime</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion testutils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>tools.vitruv</groupId>
<artifactId>tools.vitruv.dsls</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
</parent>

<artifactId>tools.vitruv.dsls.testutils</artifactId>
Expand Down

0 comments on commit 56de5d6

Please sign in to comment.