Skip to content

Commit

Permalink
Merge pull request #6 from shlaikov/hotfix/0.2.2
Browse files Browse the repository at this point in the history
Release 0.2.2
  • Loading branch information
shlaikov authored Jun 28, 2023
2 parents b721fd3 + 0d26b97 commit 461e8d3
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 12 deletions.
17 changes: 7 additions & 10 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ on:
pull_request:

jobs:

# Run Gradle Wrapper Validation Action to verify the wrapper's checksum
# Run verifyPlugin, IntelliJ Plugin Verifier, and test Gradle tasks
# Build plugin and provide the artifact for the next workflow jobs
Expand All @@ -32,7 +31,6 @@ jobs:
version: ${{ steps.properties.outputs.version }}
changelog: ${{ steps.properties.outputs.changelog }}
steps:

# Free GitHub Actions Environment Disk Space
- name: Maximize Build Space
run: |
Expand Down Expand Up @@ -79,10 +77,6 @@ jobs:
- name: Run Tests
run: ./gradlew check

# Build webview
- name: Build Frontend
run: ./gradlew buildYarn

# Collect Tests Result of failed tests
- name: Collect Tests Result
if: ${{ failure() }}
Expand All @@ -104,9 +98,13 @@ jobs:
path: ${{ steps.properties.outputs.pluginVerifierHomeDir }}/ides
key: plugin-verifier-${{ hashFiles('build/listProductsReleases.txt') }}

# Run Verify Plugin task and IntelliJ Plugin Verifier tool
- name: Run Plugin Verification tasks
run: ./gradlew runPluginVerifier -Dplugin.verifier.home.dir=${{ steps.properties.outputs.pluginVerifierHomeDir }}
# Run Verify Plugin task with Frontend builds and IntelliJ Plugin Verifier tool
- name: Build Frontend and Run Plugin Verification tasks
shell: bash
run: |
./gradlew buildYarn
./gradlew cleanYarnModules
./gradlew runPluginVerifier -Dplugin.verifier.home.dir=${{ steps.properties.outputs.pluginVerifierHomeDir }}
# Collect Plugin Verifier Result
- name: Collect Plugin Verifier Result
Expand Down Expand Up @@ -148,7 +146,6 @@ jobs:
permissions:
contents: write
steps:

# Check out current repository
- name: Fetch Sources
uses: actions/checkout@v3
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,8 @@

### Fixed
- Fixed icons in expUi.

## [0.2.2] - 2023-06-28

### Fixed
- Fixed GitHub build action
6 changes: 5 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ kover.xmlReport {
onCheck = true
}

val buildUsingYarn = tasks.register<YarnTask>("buildYarn") {
tasks.register<YarnTask>("buildYarn") {
dependsOn(tasks.yarn)
yarnCommand.set(listOf("run", "build"))
args.set(listOf(
Expand All @@ -80,6 +80,10 @@ val buildUsingYarn = tasks.register<YarnTask>("buildYarn") {
inputs.dir("src/")
}

tasks.register<Delete>("cleanYarnModules") {
delete("${project.projectDir}/src/main/resources/webview/node_modules")
}

tasks {
wrapper {
gradleVersion = properties("gradleVersion").get()
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pluginGroup = com.github.shlaikov.intellijbpmn2plugin
pluginName = intellij-bpmn2-plugin
pluginRepositoryUrl = https://github.com/shlaikov/intellij-bpmn2-plugin
# SemVer format -> https://semver.org
pluginVersion = 0.2.1
pluginVersion = 0.2.2

# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
pluginSinceBuild = 221
Expand Down

0 comments on commit 461e8d3

Please sign in to comment.