Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/conventionalpr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Conventional Commit Parser
on:
pull_request:
branches: [main, master, develop]
types: [opened, reopened, edited, review_requested, synchronize]
types: [opened, reopened, edited, synchronize]

jobs:
conventional_commit:
Expand All @@ -11,6 +11,6 @@ jobs:
permissions:
pull-requests: read
steps:
- uses: webiny/action-conventional-commits@v1.3.0
with:
- uses: amannn/action-semantic-pull-request@v6.1.1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
33 changes: 4 additions & 29 deletions .github/workflows/java.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
name: Build and Deploy Java Parser

on:
push:
branches: [develop, main]
tags: ['v*']

release:
types: [published]

jobs:
build:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -41,27 +40,12 @@ jobs:
- name: Install ANTLR4
run: make dev

- name: Set SNAPSHOT version (develop branch)
if: github.ref == 'refs/heads/develop'
run: |
cd java
BASE_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout | sed 's/-SNAPSHOT//')
mvn versions:set -DnewVersion="${BASE_VERSION}-SNAPSHOT" -DgenerateBackupPoms=false

- name: Set release version (main branch)
if: github.ref == 'refs/heads/main'
- name: Set release version
run: |
cd java
BASE_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout | sed 's/-SNAPSHOT//')
mvn versions:set -DnewVersion="${BASE_VERSION}" -DgenerateBackupPoms=false
Comment on lines 46 to 47

- name: Set release version (tag)
if: startsWith(github.ref, 'refs/tags/v')
run: |
cd java
TAG_VERSION=${GITHUB_REF_NAME#v}
mvn versions:set -DnewVersion="${TAG_VERSION}" -DgenerateBackupPoms=false

- name: Generate and Compile Java Code
run: make java_parser

Expand All @@ -72,16 +56,7 @@ jobs:
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2

- name: Deploy SNAPSHOT to Sonatype Snapshots
if: github.ref == 'refs/heads/develop'
run: cd java && mvn clean deploy -DskipCentralPublishing=true
env:
MAVEN_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}

- name: Deploy Release to Central Portal
if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')
run: cd java && mvn clean deploy
Comment on lines 59 to 60
env:
MAVEN_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ To use UVL in your projects, you can either:
<dependency>
<groupId>io.github.universal-variability-language</groupId>
<artifactId>uvl-parser</artifactId>
<version>0.3</version>
<version>0.5.1</version>
</dependency>
```
### Python Parser
Expand Down
2 changes: 1 addition & 1 deletion java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<groupId>io.github.universal-variability-language</groupId>
<artifactId>uvl-parser</artifactId>
<version>0.5.0</version>
<version>0.5.1</version>

<licenses>
<license>
Expand Down
Loading