From 7e1b150c09cb5afc32122372e68a48d70b0f8f93 Mon Sep 17 00:00:00 2001 From: Hokuto Morita Date: Mon, 11 Jul 2022 17:12:00 +0900 Subject: [PATCH 1/9] [add]github-actions --- .github/workflows/gem-push.yml | 35 ++++++++++++++++++++++++++++++++++ build.gradle | 12 +++++++++++- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/gem-push.yml diff --git a/.github/workflows/gem-push.yml b/.github/workflows/gem-push.yml new file mode 100644 index 0000000..4aec457 --- /dev/null +++ b/.github/workflows/gem-push.yml @@ -0,0 +1,35 @@ +name: main + +on: + workflow_dispatch: + push: + branches: + - 'main' + tags: + - '*' + pull_request: + branches: + - '*' + types: [ opened, synchronize ] + +jobs: + build: + name: Build + Publish + runs-on: ubuntu-latest + permissions: + packages: write + contents: read + needs: [test] + if: ${{ github.event_name == 'workflow_dispatch' || contains(github.ref, 'tags/v') }} + steps: + - uses: actions/checkout@v2 + - name: Set up Ruby 2.7 + uses: ruby/setup-ruby@v1 + with: + ruby-version: 2.7 + - 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 }}" diff --git a/build.gradle b/build.gradle index 921dee8..424ad25 100644 --- a/build.gradle +++ b/build.gradle @@ -4,6 +4,7 @@ plugins { id "checkstyle" id "maven-publish" id "org.embulk.embulk-plugins" version "0.4.1" + id "com.palantir.git-version" version "0.12.3" } repositories { @@ -12,9 +13,18 @@ repositories { } group = "io.trocco" -version = "0.0.22" description = "Bigquery output for embulk" +version = { + def baseVersion = "0.0.22" + def vd = versionDetails() + if (vd.commitDistance == 0 && vd.lastTag ==~ /^v[0-9]+\.[0-9]+\.[0-9]+(\.[a-zA-Z0-9]+)?/) { + baseVersion + } else { + "${baseVersion}.${vd.gitHash}.pre" + } +}() + sourceCompatibility = 1.8 targetCompatibility = 1.8 From f942d85f630b40ac6df49de49b93305c90dd32db Mon Sep 17 00:00:00 2001 From: Hokuto Morita Date: Mon, 11 Jul 2022 17:19:56 +0900 Subject: [PATCH 2/9] [clean] --- .github/workflows/gem-push.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/gem-push.yml b/.github/workflows/gem-push.yml index 4aec457..b4431d9 100644 --- a/.github/workflows/gem-push.yml +++ b/.github/workflows/gem-push.yml @@ -19,7 +19,6 @@ jobs: permissions: packages: write contents: read - needs: [test] if: ${{ github.event_name == 'workflow_dispatch' || contains(github.ref, 'tags/v') }} steps: - uses: actions/checkout@v2 From 2b5bea99dffd9f71f2bee6fff432d3c97894e19e Mon Sep 17 00:00:00 2001 From: Hokuto Morita Date: Mon, 11 Jul 2022 17:21:16 +0900 Subject: [PATCH 3/9] [clean] --- .github/workflows/gem-push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gem-push.yml b/.github/workflows/gem-push.yml index b4431d9..599a537 100644 --- a/.github/workflows/gem-push.yml +++ b/.github/workflows/gem-push.yml @@ -1,4 +1,4 @@ -name: main +name: Ruby Gem on: workflow_dispatch: From 4b43d5e23f15e5102da4988066ebc872b7b5211d Mon Sep 17 00:00:00 2001 From: Hokuto Morita Date: Wed, 20 Jul 2022 14:53:21 +0900 Subject: [PATCH 4/9] [clean]fix java doc comment --- .../output/bigquery_java/converter/BigqueryStringConverter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/embulk/output/bigquery_java/converter/BigqueryStringConverter.java b/src/main/java/org/embulk/output/bigquery_java/converter/BigqueryStringConverter.java index e934100..08c5cf5 100644 --- a/src/main/java/org/embulk/output/bigquery_java/converter/BigqueryStringConverter.java +++ b/src/main/java/org/embulk/output/bigquery_java/converter/BigqueryStringConverter.java @@ -109,7 +109,7 @@ public static void convertAndSet(ObjectNode node, String name, String src, Bigqu } break; case NUMERIC: - // BigQuery NUMERIC型のスケール最大値が9なのでデフォルト値を9にする + // Default value: 9, BigQuery NUMERIC type has a maximum scale of 9 int scale = columnOption != null ? columnOption.getScale() : 9; node.put(name, new BigDecimal(src).setScale(scale, BigDecimal.ROUND_CEILING)); break; From c01ddd09daffdd8ff1f3a2d86a059b219c2565d3 Mon Sep 17 00:00:00 2001 From: Hokuto Morita Date: Wed, 20 Jul 2022 14:54:47 +0900 Subject: [PATCH 5/9] [update]gem version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 424ad25..8d0f26f 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ group = "io.trocco" description = "Bigquery output for embulk" version = { - def baseVersion = "0.0.22" + def baseVersion = "0.1.0" def vd = versionDetails() if (vd.commitDistance == 0 && vd.lastTag ==~ /^v[0-9]+\.[0-9]+\.[0-9]+(\.[a-zA-Z0-9]+)?/) { baseVersion From 64e8dd9d164d71f8df16c2407e9200347ef3ce84 Mon Sep 17 00:00:00 2001 From: Hokuto Morita Date: Wed, 20 Jul 2022 14:56:43 +0900 Subject: [PATCH 6/9] Revert "[update]gem version" This reverts commit c01ddd09daffdd8ff1f3a2d86a059b219c2565d3. --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8d0f26f..424ad25 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ group = "io.trocco" description = "Bigquery output for embulk" version = { - def baseVersion = "0.1.0" + def baseVersion = "0.0.22" def vd = versionDetails() if (vd.commitDistance == 0 && vd.lastTag ==~ /^v[0-9]+\.[0-9]+\.[0-9]+(\.[a-zA-Z0-9]+)?/) { baseVersion From 2401d34277f85449bce56d72788a3a3fa73a43c4 Mon Sep 17 00:00:00 2001 From: Hokuto Morita Date: Wed, 20 Jul 2022 14:56:52 +0900 Subject: [PATCH 7/9] Revert "[clean]fix java doc comment" This reverts commit 4b43d5e23f15e5102da4988066ebc872b7b5211d. --- .../output/bigquery_java/converter/BigqueryStringConverter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/embulk/output/bigquery_java/converter/BigqueryStringConverter.java b/src/main/java/org/embulk/output/bigquery_java/converter/BigqueryStringConverter.java index 08c5cf5..e934100 100644 --- a/src/main/java/org/embulk/output/bigquery_java/converter/BigqueryStringConverter.java +++ b/src/main/java/org/embulk/output/bigquery_java/converter/BigqueryStringConverter.java @@ -109,7 +109,7 @@ public static void convertAndSet(ObjectNode node, String name, String src, Bigqu } break; case NUMERIC: - // Default value: 9, BigQuery NUMERIC type has a maximum scale of 9 + // BigQuery NUMERIC型のスケール最大値が9なのでデフォルト値を9にする int scale = columnOption != null ? columnOption.getScale() : 9; node.put(name, new BigDecimal(src).setScale(scale, BigDecimal.ROUND_CEILING)); break; From 1c1d6a09dd51f7a2d0dc9b3fd343daa254782f31 Mon Sep 17 00:00:00 2001 From: Hokuto Morita Date: Fri, 22 Jul 2022 14:24:29 +0900 Subject: [PATCH 8/9] [clean]fix gem versioning --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8d0f26f..046cc22 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ version = { def baseVersion = "0.1.0" def vd = versionDetails() if (vd.commitDistance == 0 && vd.lastTag ==~ /^v[0-9]+\.[0-9]+\.[0-9]+(\.[a-zA-Z0-9]+)?/) { - baseVersion + vd.lastTag.substring(1) } else { "${baseVersion}.${vd.gitHash}.pre" } From 0118207ad4e5e34858dac6b70f0bf271e6c20190 Mon Sep 17 00:00:00 2001 From: Hokuto Morita Date: Fri, 22 Jul 2022 15:54:59 +0900 Subject: [PATCH 9/9] [clean]gem versioning --- build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 046cc22..fd34e36 100644 --- a/build.gradle +++ b/build.gradle @@ -16,12 +16,11 @@ group = "io.trocco" description = "Bigquery output for embulk" version = { - def baseVersion = "0.1.0" def vd = versionDetails() if (vd.commitDistance == 0 && vd.lastTag ==~ /^v[0-9]+\.[0-9]+\.[0-9]+(\.[a-zA-Z0-9]+)?/) { vd.lastTag.substring(1) } else { - "${baseVersion}.${vd.gitHash}.pre" + "0.0.0.${vd.gitHash}.pre" } }()