Skip to content

Commit 1525283

Browse files
authored
shallow upgrade to 2022.3 (#207)
* shallow upgrade to 2022.3 * filter listProductsReleases to release channel * refactor github workflows and disable gradle caching * temp verify only latest version * temp verify only latest version
1 parent 32b228d commit 1525283

File tree

8 files changed

+89
-150
lines changed

8 files changed

+89
-150
lines changed

.github/workflows/build.yml

Lines changed: 17 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# - run 'runPluginVerifier' task,
77
# - create a draft release.
88
#
9-
# Workflow is triggered on push and pull_request events.
9+
# Workflow is triggered on push to main.
1010
#
1111
# GitHub Actions reference: https://help.github.com/en/actions
1212
#
@@ -15,16 +15,13 @@
1515

1616
name: Build, Verify and Prepare Release
1717
on:
18-
# Trigger the workflow on pushes to only the 'main' branch (this avoids duplicate checks being run e.g. for dependabot pull requests)
1918
push:
2019
branches: [ main ]
2120

2221
jobs:
2322

24-
# Run Gradle Wrapper Validation Action to verify the wrapper's checksum
25-
# Run verifyPlugin, IntelliJ Plugin Verifier, and test Gradle tasks
26-
# Build plugin and provide the artifact for the next workflow jobs
2723
build:
24+
2825
name: Build and Verify
2926
runs-on: ubuntu-latest
3027
outputs:
@@ -33,25 +30,24 @@ jobs:
3330

3431
steps:
3532

36-
# Check out current repository
3733
- name: Fetch Sources
3834
uses: actions/checkout@v3
3935

40-
# Validate wrapper
41-
- name: Gradle Wrapper Validation
42-
uses: gradle/[email protected]
43-
44-
# Setup Java 11 environment for the next steps
4536
- name: Setup Java
4637
uses: actions/setup-java@v3
4738
with:
4839
java-version: '11'
4940
distribution: 'corretto'
5041

51-
# All subsequent Gradle invocations will benefit from caching, build-scan capture and other features of the gradle-build-action.
52-
# setup-java can also cache gradle, but we use gradle-build-action for gradle caching and should not mix between workflows.
53-
- name: Setup Gradle
54-
uses: gradle/[email protected]
42+
- name: Setup dotnet
43+
uses: actions/setup-dotnet@v2
44+
with:
45+
dotnet-version: |
46+
6.0.102
47+
48+
- name: Validate Gradle wrapper
49+
uses: gradle/[email protected]
50+
5551

5652
# Set environment variables
5753
# the original jetbrains template feeds the whole changelog history to the release draft. we don't need it,
@@ -66,13 +62,10 @@ jobs:
6662
6763
echo "::set-output name=version::$VERSION"
6864
echo "::set-output name=name::$NAME"
69-
echo "::set-output name=pluginVerifierHomeDir::~/.pluginVerifier"
70-
71-
./gradlew listProductsReleases -q # prepare list of IDEs for Plugin Verifier
7265
73-
# Run tests
74-
- name: Run Tests
75-
run: ./gradlew build
66+
67+
- name: Build Plugin
68+
run: ./gradlew test buildPlugin --no-daemon
7669

7770
# Collect Tests Result of failed tests
7871
##todo: add other modules test reports
@@ -83,18 +76,10 @@ jobs:
8376
name: tests-result
8477
path: ${{ github.workspace }}/ide-common/build/reports/tests
8578

86-
# Cache Plugin Verifier IDEs
87-
- name: Setup Plugin Verifier IDEs Cache
88-
uses: actions/[email protected]
89-
with:
90-
path: ${{ steps.properties.outputs.pluginVerifierHomeDir }}/ides
91-
key: plugin-verifier-${{ hashFiles('build/listProductsReleases.txt') }}
9279

93-
# Run Verify Plugin task and IntelliJ Plugin Verifier tool
94-
- name: Run Plugin Verification tasks
95-
run: ./gradlew buildPlugin runPluginVerifier -Pplugin.verifier.home.dir=${{ steps.properties.outputs.pluginVerifierHomeDir }}
80+
- name: Run Plugin Verifier
81+
run: ./gradlew runPluginVerifier --no-daemon
9682

97-
# Collect Plugin Verifier Result
9883
- name: Collect Plugin Verifier Result
9984
if: ${{ always() }}
10085
uses: actions/upload-artifact@v3
@@ -107,7 +92,6 @@ jobs:
10792
# - name: Qodana - Code Inspection
10893
# uses: JetBrains/[email protected]
10994

110-
# Prepare plugin archive content for creating artifact
11195
- name: Prepare Plugin Artifact
11296
id: artifact
11397
shell: bash
@@ -118,13 +102,13 @@ jobs:
118102
119103
echo "::set-output name=filename::${FILENAME:0:-4}"
120104
121-
# Store already-built plugin as an artifact for downloading
122105
- name: Upload artifact
123106
uses: actions/upload-artifact@v3
124107
with:
125108
name: ${{ steps.artifact.outputs.filename }}
126109
path: ./build/distributions/content/*/*
127110

111+
128112
# Prepare a draft release for GitHub Releases page for the manual verification
129113
# If accepted and published, release workflow would be triggered
130114
releaseDraft:

.github/workflows/gradle-ci-pr.yml

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@ jobs:
1717
runs-on: ubuntu-latest
1818

1919
steps:
20-
- uses: actions/checkout@v3
2120

22-
- name: Set up JDK 11
21+
- name: Fetch Sources
22+
uses: actions/checkout@v3
23+
24+
- name: Setup Java
2325
uses: actions/setup-java@v3
2426
with:
2527
java-version: '11'
@@ -30,14 +32,35 @@ jobs:
3032
with:
3133
dotnet-version: |
3234
6.0.102
35+
3336
- name: Validate Gradle wrapper
3437
uses: gradle/[email protected]
3538

36-
- name: Build with Gradle
37-
uses: gradle/[email protected]
39+
- name: Build Plugin
40+
run: ./gradlew buildPlugin --no-daemon
41+
42+
# Collect Tests Result of failed tests
43+
##todo: add other modules test reports
44+
- name: Collect Tests Result
45+
if: ${{ failure() }}
46+
uses: actions/upload-artifact@v3
3847
with:
39-
cache-read-only: ${{ github.ref != 'refs/heads/main' }}
40-
arguments: build buildPlugin runPluginVerifier --no-daemon
48+
name: tests-result
49+
path: ${{ github.workspace }}/ide-common/build/reports/tests
50+
retention-days: 5
51+
52+
53+
- name: Run Plugin Verifier
54+
run: ./gradlew runPluginVerifier --no-daemon
55+
56+
- name: Collect Plugin Verifier Result
57+
if: ${{ always() }}
58+
uses: actions/upload-artifact@v3
59+
with:
60+
name: pluginVerifier-result
61+
path: ${{ github.workspace }}/build/reports/pluginVerifier
62+
retention-days: 5
63+
4164

4265
- name: Prepare Plugin Artifact
4366
id: artifact
@@ -55,12 +78,3 @@ jobs:
5578
path: ./build/distributions/content/*/*
5679
retention-days: 5
5780

58-
# Collect Tests Result of failed tests
59-
##todo: add other modules test reports
60-
- name: Collect Tests Result
61-
if: ${{ failure() }}
62-
uses: actions/upload-artifact@v3
63-
with:
64-
name: tests-result
65-
path: ${{ github.workspace }}/ide-common/build/reports/tests
66-
retention-days: 5

.github/workflows/gradle-ci.yml

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
# This workflow uses actions that are not certified by GitHub.
2-
# They are provided by a third-party and are governed by
3-
# separate terms of service, privacy policy, and support
4-
# documentation.
5-
# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
6-
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
1+
72

83
name: CI Build and Upload plugin all branches (!main)
94

@@ -17,9 +12,11 @@ jobs:
1712
runs-on: ubuntu-latest
1813

1914
steps:
20-
- uses: actions/checkout@v3
2115

22-
- name: Set up JDK 11
16+
- name: Fetch Sources
17+
uses: actions/checkout@v3
18+
19+
- name: Setup Java
2320
uses: actions/setup-java@v3
2421
with:
2522
java-version: '11'
@@ -30,18 +27,24 @@ jobs:
3027
with:
3128
dotnet-version: |
3229
6.0.102
30+
3331
- name: Validate Gradle wrapper
3432
uses: gradle/[email protected]
3533

36-
- name: Build with Gradle
37-
uses: gradle/[email protected]
34+
35+
- name: Build Plugin
36+
run: ./gradlew test buildPlugin --no-daemon
37+
38+
# Collect Tests Result of failed tests
39+
##todo: add other modules test reports
40+
- name: Collect Tests Result
41+
if: ${{ failure() }}
42+
uses: actions/upload-artifact@v3
3843
with:
39-
cache-read-only: ${{ github.ref != 'refs/heads/main' }}
40-
# gradle-home-cache-excludes: |
41-
# caches/**/riderRD-*/**
42-
# caches/**/ideaIC-*/**
43-
# caches/**/pycharmPC-*/**
44-
arguments: build buildPlugin --no-daemon
44+
name: tests-result
45+
path: ${{ github.workspace }}/ide-common/build/reports/tests
46+
retention-days: 5
47+
4548

4649
- name: Prepare Plugin Artifact
4750
id: artifact
@@ -59,12 +62,3 @@ jobs:
5962
path: ./build/distributions/content/*/*
6063
retention-days: 5
6164

62-
# Collect Tests Result of failed tests
63-
##todo: add other modules test reports
64-
- name: Collect Tests Result
65-
if: ${{ failure() }}
66-
uses: actions/upload-artifact@v3
67-
with:
68-
name: tests-result
69-
path: ${{ github.workspace }}/ide-common/build/reports/tests
70-
retention-days: 5

.github/workflows/multi-java-build.yml

Lines changed: 0 additions & 55 deletions
This file was deleted.

.github/workflows/multi-os-build.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ name: Multi OS CI Build on main
1010
on:
1111
push:
1212
branches: [ 'main' ]
13-
# pull_request:
14-
# branches: [ 'main' ]
1513

1614
jobs:
1715
build:
@@ -21,9 +19,11 @@ jobs:
2119
runs-on: ${{ matrix.os }}
2220

2321
steps:
24-
- uses: actions/checkout@v3
2522

26-
- name: Set up JDK 11
23+
- name: Fetch Sources
24+
uses: actions/checkout@v3
25+
26+
- name: Setup Java
2727
uses: actions/setup-java@v3
2828
with:
2929
java-version: '11'
@@ -34,15 +34,12 @@ jobs:
3434
with:
3535
dotnet-version: |
3636
6.0.102
37+
3738
- name: Validate Gradle wrapper
3839
uses: gradle/[email protected]
3940

40-
- name: Build with Gradle
41-
uses: gradle/[email protected]
42-
with:
43-
cache-read-only: ${{ github.ref != 'refs/heads/main' }}
44-
arguments: build buildPlugin --no-daemon
45-
41+
- name: Build Plugin
42+
run: ./gradlew buildPlugin --no-daemon
4643

4744
# Collect Tests Result of failed tests
4845
##todo: add other modules test reports
@@ -52,3 +49,4 @@ jobs:
5249
with:
5350
name: tests-result
5451
path: ${{ github.workspace }}/ide-common/build/reports/tests
52+
retention-days: 5

0 commit comments

Comments
 (0)