From cbc65a9bd387f7a93a9def4fb9e1fb3a9a8cf291 Mon Sep 17 00:00:00 2001 From: "Kai Kitamura(NamedPython)" Date: Wed, 9 Apr 2025 15:46:45 +0900 Subject: [PATCH 1/3] feat: enable checks at PR, tag push focuses to gem push, fix Java problem at gem push --- .github/workflows/check.yml | 40 +++++++++++++++++++++++++ .github/workflows/gem-push.yml | 23 +++++++++++++++ .github/workflows/main.yml | 54 ---------------------------------- 3 files changed, 63 insertions(+), 54 deletions(-) create mode 100644 .github/workflows/check.yml create mode 100644 .github/workflows/gem-push.yml delete mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml new file mode 100644 index 0000000..aa00ff8 --- /dev/null +++ b/.github/workflows/check.yml @@ -0,0 +1,40 @@ +name: Check + +on: + workflow_dispatch: + push: + branches: + - master + pull_request: + branches: + - master + types: + - opened + - synchronize + +jobs: + check: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK 1.8 + uses: actions/setup-java@v4 + with: + java-version: 8 + distribution: "zulu" + + - uses: actions/cache@v3 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- + + - name: Lint + run: ./gradlew spotlessCheck + - name: Test + run: ./gradlew test diff --git a/.github/workflows/gem-push.yml b/.github/workflows/gem-push.yml new file mode 100644 index 0000000..978158d --- /dev/null +++ b/.github/workflows/gem-push.yml @@ -0,0 +1,23 @@ +name: Ruby Gem + +on: + workflow_dispatch: + push: + tags: + - '*' + +jobs: + build: + name: Build + Publish + runs-on: ubuntu-latest + permissions: + packages: write + contents: read + steps: + - uses: actions/checkout@v2 + - name: push gem + uses: trocco-io/push-gem-to-gpr-action@v2 + with: + language: java + gem-path: "./build/gems/*.gem" + github-token: "${{ secrets.GITHUB_TOKEN }}" diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index c4d8fa5..0000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,54 +0,0 @@ -name: main - -on: - push: - branches: - - 'main' - tags: - - '*' - pull_request: - branches: - - 'main' - types: [opened, synchronize] - pull_request_target: - branches: - - 'main' - types: [labeled] - -jobs: - test: - name: test - runs-on: ubuntu-latest - if: > - ${{ - github.event_name == 'pull_request' || - github.event_name == 'workflow_dispatch' || - (github.event_name == 'pull_request_target' && contains(github.event.pull_request.labels.*.name, 'safe to test')) || - startsWith(github.ref, 'refs/tags/') - }} - steps: - - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 - with: - java-version: 1.8 - - name: lint - run: ./gradlew spotlessCheck - - name: Test - run: ./gradlew test - build: - name: Build + Publish - runs-on: ubuntu-latest - permissions: - packages: write - contents: read - needs: [ test ] - if: ${{ github.event_name == 'workflow_dispatch' || contains(github.ref, 'refs/tags/') }} - steps: - - uses: actions/checkout@v2 - - name: push gem - uses: trocco-io/push-gem-to-gpr-action@v1 - with: - language: java - gem-path: "./build/gems/*.gem" - github-token: "${{ secrets.GITHUB_TOKEN }}" From bdb8dd5b434b5c45e337336cb536727eea15c57a Mon Sep 17 00:00:00 2001 From: "Kai Kitamura(NamedPython)" Date: Wed, 9 Apr 2025 20:50:19 +0900 Subject: [PATCH 2/3] fix: add ruby/java setup to gem push, runs test before build + publish --- .github/workflows/check.yml | 4 ---- .github/workflows/gem-push.yml | 42 +++++++++++++++++++++++++++++++++- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index aa00ff8..31841dc 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -15,16 +15,13 @@ on: jobs: check: runs-on: ubuntu-latest - steps: - uses: actions/checkout@v4 - - name: Set up JDK 1.8 uses: actions/setup-java@v4 with: java-version: 8 distribution: "zulu" - - uses: actions/cache@v3 with: path: | @@ -33,7 +30,6 @@ jobs: key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} restore-keys: | ${{ runner.os }}-gradle- - - name: Lint run: ./gradlew spotlessCheck - name: Test diff --git a/.github/workflows/gem-push.yml b/.github/workflows/gem-push.yml index 978158d..bf91ee8 100644 --- a/.github/workflows/gem-push.yml +++ b/.github/workflows/gem-push.yml @@ -7,15 +7,55 @@ on: - '*' jobs: + test: + runs-on: ubuntu-latest + steps: + - name: Set up JDK 1.8 + uses: actions/setup-java@v4 + with: + java-version: 8 + distribution: "zulu" + - uses: actions/cache@v3 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- + - name: Lint + run: ./gradlew spotlessCheck + - name: Test + run: ./gradlew test build: name: Build + Publish runs-on: ubuntu-latest + needs: + - test permissions: packages: write contents: read steps: - uses: actions/checkout@v2 - - name: push gem + - name: Set up Ruby 2.7 + uses: ruby/setup-ruby@v1 + with: + ruby-version: 2.7 + - name: Set up JDK 1.8 + uses: actions/setup-java@v4 + with: + java-version: 8 + distribution: "zulu" + - uses: actions/cache@v3 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- + + - name: Push gem uses: trocco-io/push-gem-to-gpr-action@v2 with: language: java From 035f167d3279a8ce9d52ed5857f1be0a259e9238 Mon Sep 17 00:00:00 2001 From: "Kai Kitamura(NamedPython)" Date: Wed, 9 Apr 2025 21:18:10 +0900 Subject: [PATCH 3/3] fix: versions of actions/* --- .github/workflows/check.yml | 2 +- .github/workflows/gem-push.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 31841dc..a597f54 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -22,7 +22,7 @@ jobs: with: java-version: 8 distribution: "zulu" - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: | ~/.gradle/caches diff --git a/.github/workflows/gem-push.yml b/.github/workflows/gem-push.yml index bf91ee8..46a31bd 100644 --- a/.github/workflows/gem-push.yml +++ b/.github/workflows/gem-push.yml @@ -15,7 +15,7 @@ jobs: with: java-version: 8 distribution: "zulu" - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: | ~/.gradle/caches @@ -36,7 +36,7 @@ jobs: packages: write contents: read steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Ruby 2.7 uses: ruby/setup-ruby@v1 with: @@ -46,7 +46,7 @@ jobs: with: java-version: 8 distribution: "zulu" - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: | ~/.gradle/caches