Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modify repository structure for preparing public #17

Merged
merged 3 commits into from
Sep 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 8 additions & 35 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ on:
jobs:
Build:
runs-on: [self-hosted, docker]
permissions:
checks: write
timeout-minutes: 30
container:
image: ghcr.io/project-tsurugi/oltp-sandbox:latest
Expand All @@ -29,58 +31,29 @@ 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 showTsubakuroManifest showIceaxeManifest 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: 'java/cost-accounting-benchmark/build/test-results/**/TEST-*.xml'
junit_test_src_dir: 'java/cost-accounting-benchmark/src/test/java'
spotbugs_input: 'java/cost-accounting-benchmark/build/reports/spotbugs/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 }}
2 changes: 1 addition & 1 deletion java/cost-accounting-benchmark/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ dependencies {
implementation group: 'com.oracle.database.jdbc', name: 'ucp', version: '21.1.0.0'
runtimeOnly group: 'com.oracle.database.nls', name: 'orai18n', version: '21.1.0.0'

api 'com.tsurugidb.iceaxe:iceaxe-core:0.0.1-SNAPSHOT'
api 'com.tsurugidb.iceaxe:iceaxe-core:1.0.0-SNAPSHOT'

// https://mvnrepository.com/artifact/org.apache.poi/poi
implementation group: 'org.apache.poi', name: 'poi', version: '4.1.2'
Expand Down
Binary file modified java/cost-accounting-benchmark/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -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
Loading