Skip to content

Commit

Permalink
Merge branch 'release/1.0.10'
Browse files Browse the repository at this point in the history
  • Loading branch information
nekofar committed Jan 28, 2024
2 parents c3a4896 + 53db717 commit 0b033f5
Show file tree
Hide file tree
Showing 6 changed files with 61 additions and 17 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:

# Setup Gradle
- name: Setup Gradle
uses: gradle/gradle-build-action@v2.10.0
uses: gradle/gradle-build-action@v2.12.0

# Set environment variables
- name: Export Properties
Expand Down Expand Up @@ -122,7 +122,7 @@ jobs:
# Store already-built plugin as an artifact for downloading
- name: Upload artifact
uses: actions/upload-artifact@v3.1.3
uses: actions/upload-artifact@v4.3.0
with:
name: ${{ steps.artifact.outputs.filename }}
path: ./build/distributions/content/*/*
Expand All @@ -147,7 +147,7 @@ jobs:

# Setup Gradle
- name: Setup Gradle
uses: gradle/gradle-build-action@v2.10.0
uses: gradle/gradle-build-action@v2.12.0

# Run tests
- name: Run Tests
Expand All @@ -156,14 +156,14 @@ jobs:
# Collect Tests Result of failed tests
- name: Collect Tests Result
if: ${{ failure() }}
uses: actions/upload-artifact@v3.1.3
uses: actions/upload-artifact@v4.3.0
with:
name: tests-result
path: ${{ github.workspace }}/build/reports/tests

# Upload Kover report to CodeCov
- name: Upload Code Coverage Report
uses: codecov/[email protected].4
uses: codecov/[email protected].5
with:
files: ${{ github.workspace }}/build/reports/kover/xml/report.xml

Expand Down Expand Up @@ -191,7 +191,7 @@ jobs:

# Run Qodana inspections
- name: Qodana - Code Inspection
uses: JetBrains/qodana-action@v2023.2.8
uses: JetBrains/qodana-action@v2023.3.1
with:
cache-default-branch-only: true

Expand Down Expand Up @@ -220,11 +220,11 @@ jobs:

# Setup Gradle
- name: Setup Gradle
uses: gradle/gradle-build-action@v2.10.0
uses: gradle/gradle-build-action@v2.12.0

# Cache Plugin Verifier IDEs
- name: Setup Plugin Verifier IDEs Cache
uses: actions/cache@v3.3.2
uses: actions/cache@v4.0.0
with:
path: ${{ needs.build.outputs.pluginVerifierHomeDir }}/ides
key: plugin-verifier-${{ hashFiles('build/listProductsReleases.txt') }}
Expand All @@ -236,7 +236,7 @@ jobs:
# Collect Plugin Verifier Result
- name: Collect Plugin Verifier Result
if: ${{ always() }}
uses: actions/upload-artifact@v3.1.3
uses: actions/upload-artifact@v4.3.0
with:
name: pluginVerifier-result
path: ${{ github.workspace }}/build/reports/pluginVerifier
Expand Down
44 changes: 44 additions & 0 deletions .github/workflows/git-flow.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# Name of the workflow
name: Git Flow

# Defines the event that triggers the workflow
on:
push:
branches:
- 'feature/*' # Trigger for pushes to feature branches
- 'bugfix/*' # Trigger for pushes to bugfix branches
- 'release/*' # Trigger for pushes to release branches
- 'hotfix/*' # Trigger for pushes to hotfix branches

# Jobs are a set of steps that execute on the same runner
jobs:
create-pull-request:
# Specifies the runner environment, using the latest Ubuntu
runs-on: ubuntu-latest
name: Create Pull Request
permissions: write-all

# Steps are individual tasks that run commands in a job
steps:
# Checks out the repository code under $GITHUB_WORKSPACE, so the job can access it
- name: Checkout Repository Code
uses: actions/[email protected]

# This step uses the Git Flow Action to create PRs based on branch types
- name: Execute Git Flow Action
uses: nekofar/git-flow-action@develop # Specifies the Git Flow Action to use and the branch
with:
# The GitHub Token for authentication with GitHub API
github-token: ${{ secrets.GITHUB_TOKEN }}
# The branch to target for release and hotfix PRs
master-branch: 'master'
# The branch to target for feature and bugfix PRs
develop-branch: 'develop'
# Prefix for feature branches
feature-prefix: 'feature/'
# Prefix for bugfix branches
bugfix-prefix: 'bugfix/'
# Prefix for release branches
release-prefix: 'release/'
# Prefix for hotfix branches
hotfix-prefix: 'hotfix/'
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:

# Setup Gradle
- name: Setup Gradle
uses: gradle/gradle-build-action@v2.10.0
uses: gradle/gradle-build-action@v2.12.0

# Publish the plugin to the Marketplace
- name: Publish Plugin
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run-ui-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:

# Setup Gradle
- name: Setup Gradle
uses: gradle/gradle-build-action@v2.10.0
uses: gradle/gradle-build-action@v2.12.0

# Run IDEA prepared for UI testing
- name: Run IDE
Expand Down
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ pluginName = IntelliJ Hono Plugin
pluginRepositoryUrl = https://github.com/KartanHQ/intellij-hono

# SemVer format -> https://semver.org
pluginVersion = 1.0.9
pluginVersion = 1.0.10

# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
pluginSinceBuild = 222
pluginUntilBuild = 233.*
pluginSinceBuild = 231
pluginUntilBuild = 241.*

# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
platformType = IU
platformVersion = 2022.2
platformVersion = 2023.1

# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
annotations = "24.1.0"

# plugins
kotlin = "1.9.21"
kotlin = "1.9.22"
changelog = "2.2.0"
gradleIntelliJPlugin = "1.16.1"
gradleIntelliJPlugin = "1.17.0"
qodana = "0.1.13"
kover = "0.7.5"

Expand Down

0 comments on commit 0b033f5

Please sign in to comment.