Skip to content

Commit 89205ad

Browse files
committed
Merge branch 'release/1.2.26'
2 parents c344e96 + d01bf4f commit 89205ad

File tree

7 files changed

+67
-17
lines changed

7 files changed

+67
-17
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060

6161
# Setup Gradle
6262
- name: Setup Gradle
63-
uses: gradle/gradle-build-action@v2.10.0
63+
uses: gradle/gradle-build-action@v2.12.0
6464

6565
# Set environment variables
6666
- name: Export Properties
@@ -109,7 +109,7 @@ jobs:
109109
110110
# Store already-built plugin as an artifact for downloading
111111
- name: Upload artifact
112-
uses: actions/upload-artifact@v3.1.3
112+
uses: actions/upload-artifact@v4.3.0
113113
with:
114114
name: ${{ steps.artifact.outputs.filename }}
115115
path: ./build/distributions/content/*/*
@@ -134,7 +134,7 @@ jobs:
134134

135135
# Setup Gradle
136136
- name: Setup Gradle
137-
uses: gradle/gradle-build-action@v2.10.0
137+
uses: gradle/gradle-build-action@v2.12.0
138138

139139
# Run tests
140140
- name: Run Tests
@@ -143,14 +143,14 @@ jobs:
143143
# Collect Tests Result of failed tests
144144
- name: Collect Tests Result
145145
if: ${{ failure() }}
146-
uses: actions/upload-artifact@v3.1.3
146+
uses: actions/upload-artifact@v4.3.0
147147
with:
148148
name: tests-result
149149
path: ${{ github.workspace }}/build/reports/tests
150150

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

@@ -178,7 +178,7 @@ jobs:
178178

179179
# Run Qodana inspections
180180
- name: Qodana - Code Inspection
181-
uses: JetBrains/[email protected].0
181+
uses: JetBrains/[email protected].1
182182
with:
183183
cache-default-branch-only: true
184184

@@ -207,11 +207,11 @@ jobs:
207207

208208
# Setup Gradle
209209
- name: Setup Gradle
210-
uses: gradle/gradle-build-action@v2.10.0
210+
uses: gradle/gradle-build-action@v2.12.0
211211

212212
# Cache Plugin Verifier IDEs
213213
- name: Setup Plugin Verifier IDEs Cache
214-
uses: actions/cache@v3.3.2
214+
uses: actions/cache@v4.0.0
215215
with:
216216
path: ${{ needs.build.outputs.pluginVerifierHomeDir }}/ides
217217
key: plugin-verifier-${{ hashFiles('build/listProductsReleases.txt') }}
@@ -223,7 +223,7 @@ jobs:
223223
# Collect Plugin Verifier Result
224224
- name: Collect Plugin Verifier Result
225225
if: ${{ always() }}
226-
uses: actions/upload-artifact@v3.1.3
226+
uses: actions/upload-artifact@v4.3.0
227227
with:
228228
name: pluginVerifier-result
229229
path: ${{ github.workspace }}/build/reports/pluginVerifier

.github/workflows/git-flow.yml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# Name of the workflow
2+
name: Git Flow
3+
4+
# Defines the event that triggers the workflow
5+
on:
6+
push:
7+
branches:
8+
- 'feature/*' # Trigger for pushes to feature branches
9+
- 'bugfix/*' # Trigger for pushes to bugfix branches
10+
- 'release/*' # Trigger for pushes to release branches
11+
- 'hotfix/*' # Trigger for pushes to hotfix branches
12+
13+
# Jobs are a set of steps that execute on the same runner
14+
jobs:
15+
create-pull-request:
16+
# Specifies the runner environment, using the latest Ubuntu
17+
runs-on: ubuntu-latest
18+
name: Create Pull Request
19+
permissions: write-all
20+
21+
# Steps are individual tasks that run commands in a job
22+
steps:
23+
# Checks out the repository code under $GITHUB_WORKSPACE, so the job can access it
24+
- name: Checkout Repository Code
25+
uses: actions/[email protected]
26+
27+
# This step uses the Git Flow Action to create PRs based on branch types
28+
- name: Execute Git Flow Action
29+
uses: nekofar/git-flow-action@develop # Specifies the Git Flow Action to use and the branch
30+
with:
31+
# The GitHub Token for authentication with GitHub API
32+
github-token: ${{ secrets.GITHUB_TOKEN }}
33+
# The branch to target for release and hotfix PRs
34+
master-branch: 'master'
35+
# The branch to target for feature and bugfix PRs
36+
develop-branch: 'develop'
37+
# Prefix for feature branches
38+
feature-prefix: 'feature/'
39+
# Prefix for bugfix branches
40+
bugfix-prefix: 'bugfix/'
41+
# Prefix for release branches
42+
release-prefix: 'release/'
43+
# Prefix for hotfix branches
44+
hotfix-prefix: 'hotfix/'

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
# Setup Gradle
3535
- name: Setup Gradle
36-
uses: gradle/gradle-build-action@v2.10.0
36+
uses: gradle/gradle-build-action@v2.12.0
3737

3838
# Publish the plugin to the Marketplace
3939
- name: Publish Plugin

.github/workflows/run-ui-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444

4545
# Setup Gradle
4646
- name: Setup Gradle
47-
uses: gradle/gradle-build-action@v2.10.0
47+
uses: gradle/gradle-build-action@v2.12.0
4848

4949
# Run IDEA prepared for UI testing
5050
- name: Run IDE

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
All notable changes to this project will be documented in this file.
44

55
## [Unreleased]
6+
## [1.2.26] - 2024-01-28
7+
8+
### Bug Fixes
9+
10+
- Solve some minor issues and update dependencies
11+
612
## [1.2.25] - 2023-12-12
713

814
### Bug Fixes

gradle.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ pluginName = IntelliJ Nest Plugin
55
pluginRepositoryUrl = https://github.com/KartanHQ/intellij-nestjs
66

77
# SemVer format -> https://semver.org
8-
pluginVersion = 1.2.25
8+
pluginVersion = 1.2.26
99

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

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

1818
# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
1919
# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
annotations = "24.1.0"
44

55
# plugins
6-
kotlin = "1.9.21"
6+
kotlin = "1.9.22"
77
changelog = "2.2.0"
8-
gradleIntelliJPlugin = "1.16.1"
8+
gradleIntelliJPlugin = "1.17.0"
99
qodana = "0.1.13"
1010
kover = "0.7.5"
1111

0 commit comments

Comments
 (0)