Skip to content

Commit 50425cd

Browse files
popemattpopematt
committed
Remove no-longer-needed concurrency in the workflow
1 parent 6279a43 commit 50425cd

File tree

3 files changed

+15
-101
lines changed

3 files changed

+15
-101
lines changed

‎.github/workflows/build.yml‎

Lines changed: 9 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# GitHub Action Workflow for building a new commit to the primary repo branch and publishing a new release to beta.
22
#
3-
# Workflow is triggered on pushes into master.
3+
# Workflow is triggered on pushes. Beta publish job runs conditionally if pushed to master.
44
#
55
# Additional Docs:
66
# - GitHub Actions: https://help.github.com/en/actions
@@ -17,76 +17,27 @@ jobs:
1717
name: Build
1818
runs-on: codebuild-ion-intellij-plugin-${{ github.run_id }}-${{ github.run_attempt }}-arm-3.0-large
1919
steps:
20-
21-
# Check out current repository
22-
- name: Fetch Sources
23-
uses: actions/checkout@v2
24-
25-
- name: Setup JDK
26-
uses: actions/setup-java@v3
20+
- uses: actions/checkout@v4
21+
- uses: actions/setup-java@v3
2722
with:
2823
distribution: 'corretto'
2924
java-version: '17'
30-
3125
- uses: gradle/actions/setup-gradle@v4
3226

33-
- run: df
3427
# Build artifact using buildPlugin Gradle task
3528
- name: Build Plugin
36-
run: ./gradlew buildPlugin
37-
38-
- run: df
39-
- name: Get Product Versions
40-
id: get-products
41-
run: |
42-
PRODUCTS="$(./gradlew printProductsReleases -q | jq -cnR '[inputs | select(length > 0)]')"
43-
echo "products=$PRODUCTS"
44-
echo "products=$PRODUCTS" >> "$GITHUB_OUTPUT"
45-
46-
outputs:
47-
products: ${{ steps.get-products.outputs.products }}
48-
49-
verify:
50-
runs-on: codebuild-ion-intellij-plugin-${{ github.run_id }}-${{ github.run_attempt }}-arm-3.0-large
51-
needs: build
52-
strategy:
53-
fail-fast: false
54-
matrix:
55-
product: ${{ fromJSON(needs.build.outputs.products) }}
56-
steps:
57-
- run: df
58-
- uses: actions/checkout@v4
59-
- run: df
60-
- uses: actions/setup-java@v3
61-
with:
62-
distribution: 'corretto'
63-
java-version: '17'
64-
- run: df
29+
run: ./gradlew build
6530

66-
# Cache Gradle dependencies
67-
- name: Setup Gradle Dependencies Cache
68-
uses: actions/cache@v2
69-
with:
70-
path: ~/.gradle/caches
71-
key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle', '**/*.gradle.kts') }}
72-
73-
# Cache Gradle Wrapper
74-
- name: Setup Gradle Wrapper Cache
75-
uses: actions/cache@v2
76-
with:
77-
path: ~/.gradle/wrapper
78-
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
79-
80-
- run: df
81-
82-
# Don't set up gradle here. We've already verified the gradle wrapper in the previous job.
31+
# Build artifact using buildPlugin Gradle task
32+
- name: Build Plugin
33+
run: ./gradlew buildPlugin
8334

8435
# Run intellij:verifyPlugin task.
8536
- name: Verify Plugin
86-
run: ./gradlew verifyPlugin -PverifyPlugin="${{ matrix.product }}"
37+
run: ./gradlew verifyPlugin
8738

8839
publish-beta:
89-
needs: verify
40+
needs: build
9041
runs-on: codebuild-ion-intellij-plugin-${{ github.run_id }}-${{ github.run_attempt }}-arm-3.0-large
9142
if: github.repository == 'amazon-ion/ion-intellij-plugin'
9243
steps:

‎.github/workflows/pr.yml‎

Lines changed: 3 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,12 @@ jobs:
1818
name: Build
1919
runs-on: codebuild-ion-intellij-plugin-${{ github.run_id }}-${{ github.run_attempt }}-arm-3.0-large
2020
steps:
21-
22-
# Check out current repository
23-
- name: Fetch Sources
24-
uses: actions/checkout@v2
25-
26-
- name: Setup JDK
27-
uses: actions/setup-java@v3
21+
- uses: actions/checkout@v4
22+
- uses: actions/setup-java@v3
2823
with:
2924
distribution: 'corretto'
3025
java-version: '17'
31-
3226
- uses: gradle/actions/setup-gradle@v4
33-
with:
34-
cache-disabled: true
3527

3628
# Build artifact using build Gradle task
3729
- name: Build
@@ -41,33 +33,6 @@ jobs:
4133
- name: Build Plugin
4234
run: ./gradlew buildPlugin
4335

44-
- name: Get Product Versions
45-
id: get-products
46-
run: |
47-
PRODUCTS="$(./gradlew printProductsReleases -q | jq -cnR '[inputs | select(length > 0)]')"
48-
echo "products=$PRODUCTS"
49-
echo "products=$PRODUCTS" >> "$GITHUB_OUTPUT"
50-
51-
outputs:
52-
products: ${{ steps.get-products.outputs.products }}
53-
54-
verify:
55-
runs-on: codebuild-ion-intellij-plugin-${{ github.run_id }}-${{ github.run_attempt }}-arm-3.0-large
56-
needs: build
57-
strategy:
58-
fail-fast: false
59-
matrix:
60-
product: ${{ fromJSON(needs.build.outputs.products) }}
61-
steps:
62-
- uses: actions/checkout@v4
63-
- uses: actions/setup-java@v3
64-
with:
65-
distribution: 'corretto'
66-
java-version: '17'
67-
- uses: gradle/actions/setup-gradle@v4
68-
with:
69-
cache-read-only: true
70-
7136
# Run intellij:verifyPlugin task.
7237
- name: Verify Plugin
73-
run: ./gradlew verifyPlugin -PverifyPlugin="${{ matrix.product }}"
38+
run: ./gradlew verifyPlugin

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# GitHub Action Workflow for releasing a new stable version of the plugin.
22
#
3-
# Workflow is triggered manually w/ proper access.
3+
# Workflow is triggered when a new release is published.
44
#
55
# Additional Docs:
66
# - GitHub Actions: https://help.github.com/en/actions
@@ -19,8 +19,7 @@ jobs:
1919
runs-on: codebuild-ion-intellij-plugin-${{ github.run_id }}-${{ github.run_attempt }}-arm-3.0-large
2020
steps:
2121
# Check out current repository
22-
- name: Fetch Sources
23-
uses: actions/checkout@v2
22+
- uses: actions/checkout@v4
2423

2524
# Generate resources/plugin-changenotes.html
2625
- name: Generate Changenotes
@@ -34,8 +33,7 @@ jobs:
3433
- name: Log Changenotes Content
3534
run: cat resources/plugin-changenotes.html
3635

37-
- name: Setup JDK
38-
uses: actions/setup-java@v3
36+
- uses: actions/setup-java@v3
3937
with:
4038
distribution: 'corretto'
4139
java-version: '17'

0 commit comments

Comments
 (0)