Skip to content

Commit

Permalink
Switching to the new branching strategy (#292)
Browse files Browse the repository at this point in the history
Additional branches have been created for 233 and 232. The main branch
now tracks 241 EAPs.
  • Loading branch information
rock3r authored Feb 2, 2024
1 parent 22ec6c9 commit 003eb1e
Show file tree
Hide file tree
Showing 36 changed files with 145 additions and 701 deletions.
36 changes: 12 additions & 24 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,52 +8,40 @@ jobs:
assemble:
runs-on: ubuntu-latest

strategy:
matrix:
supported-ij-version:
- 232
- 233
- 241

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'zulu'
java-version: 17
distribution: zulu
cache: gradle

- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Run :assemble task
run: ./gradlew assemble -Psupported.ij.version=${{ matrix.supported-ij-version }}
run: ./gradlew assemble

checks:
runs-on: ubuntu-latest

strategy:
matrix:
supported-ij-version:
- 232
- 233
- 241

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'zulu'
java-version: 17
distribution: zulu
cache: gradle

- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Run :check task
run: ./gradlew check -Psupported.ij.version=${{ matrix.supported-ij-version }} --continue
run: ./gradlew check --continue

- uses: github/codeql-action/upload-sarif@v2
if: ${{ always() }}
Expand Down
19 changes: 12 additions & 7 deletions .github/workflows/check-ide-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,24 @@ jobs:

strategy:
matrix:
supported-ij-version:
- 232
- 233
- 241
branch-name:
- releases/232
- releases/233
- main

steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
- uses: actions/checkout@v4
with:
ref: ${{ matrix.branch-name }}

- uses: actions/setup-java@v4
with:
distribution: zulu
java-version: 17
cache: gradle

- name: Setup Gradle
run: chmod +x gradlew

- name: Run Gradle
run: ./gradlew checkLatestIntelliJPlatformBuild -Psupported.ij.version=${{ matrix.supported-ij-version }}
run: ./gradlew checkLatestIntelliJPlatformBuild
40 changes: 24 additions & 16 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,51 +4,59 @@ on:
release:
types: [ published ]
push:
branches: [ main ]
branches:
- main
- 'releases/**'

jobs:
publish-core:
name: Publish Jewel Core
publish-current:
name: Publish standalone & current-IJP-version bridge
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
- uses: actions/checkout@v4

- uses: actions/setup-java@v4
with:
distribution: zulu
java-version: 17
cache: gradle

- name: Setup Gradle
run: chmod +x gradlew

- name: Run Gradle
# supported.ij.version is needed here for project configuration and won't be used during publishing
run: ./gradlew publishMainPublicationToSpaceRepository -Psupported.ij.version=232
run: ./gradlew publishMainPublicationToSpaceRepository
env:
MAVEN_SPACE_USERNAME: ${{secrets.MAVEN_SPACE_USERNAME}}
MAVEN_SPACE_PASSWORD: ${{secrets.MAVEN_SPACE_PASSWORD}}

publish-ide:
name: Publish Jewel IDE part
needs: publish-core
publish-older:
name: Publish older-IJP-version bridge(s)
runs-on: ubuntu-latest

strategy:
matrix:
supported-ij-version:
- 232
- 233
branch-name:
- releases/232
- releases/233

steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
- uses: actions/checkout@v4
with:
ref: ${{ matrix.branch-name }}

- uses: actions/setup-java@v4
with:
distribution: zulu
java-version: 17
cache: gradle

- name: Setup Gradle
run: chmod +x gradlew

- name: Run Gradle
run: ./gradlew publishIdeMainPublicationToSpaceRepository -Psupported.ij.version=${{ matrix.supported-ij-version }}
run: ./gradlew :ide-laf-bridge:publishMainPublicationToSpaceRepository
env:
MAVEN_SPACE_USERNAME: ${{secrets.MAVEN_SPACE_USERNAME}}
MAVEN_SPACE_PASSWORD: ${{secrets.MAVEN_SPACE_PASSWORD}}
24 changes: 0 additions & 24 deletions .idea/runConfigurations/Check_IJP_version__23_2_.xml

This file was deleted.

24 changes: 0 additions & 24 deletions .idea/runConfigurations/Check_IJP_version__23_3_.xml

This file was deleted.

25 changes: 0 additions & 25 deletions .idea/runConfigurations/IDE_sample__23_2_.xml

This file was deleted.

25 changes: 0 additions & 25 deletions .idea/runConfigurations/IDE_sample__23_3_.xml

This file was deleted.

24 changes: 0 additions & 24 deletions .idea/runConfigurations/Run_checks__IJ_23_2_.xml

This file was deleted.

24 changes: 0 additions & 24 deletions .idea/runConfigurations/Run_checks__IJ_23_3_.xml

This file was deleted.

Loading

0 comments on commit 003eb1e

Please sign in to comment.