Merge pull request #16 from project-tsurugi/ci-sb-prepare-public

Modify repository structure for preparing public
project-tsurugi · Sep 18, 2023 · e99acb9 · e99acb9
2 parents 2122f63 + 64b4dff
commit e99acb9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 57 deletions.
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -1,13 +1,12 @@
 name: Tsubakuro-Examples-CI
 
-on:
-  push:
-  pull_request:
-  workflow_dispatch:
+on: [push, pull_request, workflow_dispatch]
 
 jobs:
   Build:
     runs-on: [self-hosted, docker]
+    permissions:
+      checks: write
     timeout-minutes: 30
     container:
       image: ghcr.io/project-tsurugi/oltp-sandbox:ubuntu-22.04
@@ -24,59 +23,30 @@ jobs:
       GPR_KEY: ${{ secrets.GHCR_PAT }}
 
     steps:
-      - id: Setup_Java
-        name: Setup_Java
+      - name: Setup_Java
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: '11'
 
-      - id: Checkout
-        name: Checkout
+      - name: Checkout
         uses: actions/checkout@v3
         with:
-          submodules: recursive
           token: ${{ secrets.GHA_PAT }}
 
-      - id: Checkout_Actions
-        name: Checkout_Actions
-        uses: actions/checkout@v3
-        with:
-          repository: project-tsurugi/tsurugi-github-actions
-          path: .github/actions
-          ref: master
-          submodules: recursive
-          token: ${{ secrets.GHA_PAT }}
-
-      - id: Assemble
-        name: Assemble
+      - name: Assemble
         run: |
           ./gradlew -i clean assemble
 
-      - id: Check
-        name: Check
+      - name: Check
         run: |
           ./gradlew -i check --continue
 
-      - id: Generate_Annotations
-        name: Generate_Annotations
-        uses: ./.github/actions/tsurugi-annotations-action
+      - name: Verify
+        uses: project-tsurugi/tsurugi-annotations-action@v1
         if: always()
         with:
           junit_input: '**/build/test-results/**/TEST-*.xml'
           junit_test_src_dir: 'src/test/java'
           spotbugs_input: '**/build/reports/spotbugs/main/*.xml'
           checkstyle_input: '**/build/reports/checkstyle/main.xml'
-
-      - id: Notify_Slack
-        name: Notify_Slack
-        uses: ./.github/actions/tsurugi-slack-action
-        if: always() && (github.event.pull_request.draft == false) && (contains(github.ref, '/tags/') || contains(github.ref, '/pull/') || contains(github.ref, '/heads/master'))
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-        with:
-          kind: 'job-result'
-          channel: 'tsurugi-build'
-          status: ${{ job.status }}
-          step_context: ${{ toJson(steps) }}
-          username: ${{ github.workflow }}
diff --git a/buildSrc/src/main/groovy/tsubakuro-examples.java-conventions.gradle b/buildSrc/src/main/groovy/tsubakuro-examples.java-conventions.gradle
@@ -6,10 +6,10 @@ plugins {
 }
 
 group = 'com.tsurugidb.tsubakuro-examples'
-version = '0.0.1-SNAPSHOT'
+version = '1.0.0-SNAPSHOT'
 
 ext {
-    tsubakuroVersion = '0.0.1-SNAPSHOT'
+    tsubakuroVersion = '1.0.0-SNAPSHOT'
 }
 
 if (hasProperty('mavenLocal')) {
@@ -78,21 +78,6 @@ tasks.withType(JavaCompile) { task ->
     task.options.encoding = 'UTF-8'
 }
 
-task sourcesJar(type: Jar) {
-    classifier 'sources'
-    from sourceSets.main.allSource
-}
-
-task testsJar(type: Jar) {
-    classifier 'tests'
-    from sourceSets.test.output
-}
-
-artifacts {
-    archives tasks.sourcesJar
-    archives tasks.testsJar
-}
-
 tasks.named('test') {
     useJUnitPlatform()
     systemProperty('junit.jupiter.testclass.order.default', 'org.junit.jupiter.api.ClassOrderer$OrderAnnotation')

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists