From 1bf6d6015a06a51b8d4ffa6422ebb71f41f60627 Mon Sep 17 00:00:00 2001
From: Wilson Lin <code@wilsonl.in>
Date: Sun, 19 Jan 2020 23:44:05 +1100
Subject: [PATCH] Clean up Java workflow; fix Ruby gem versioning

---
 .github/workflows/java.yml | 10 +---------
 ruby/hyperbuild.gemspec    |  2 +-
 version                    |  2 +-
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
index b6dcf24..1243ef1 100644
--- a/.github/workflows/java.yml
+++ b/.github/workflows/java.yml
@@ -23,10 +23,6 @@ jobs:
             FILE: 'libhyperbuild_java.dylib'
     steps:
       - uses: actions/checkout@v1
-      - name: Get version
-        id: version
-        shell: bash
-        run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/v}
       - name: Set up Rust
         uses: actions-rs/toolchain@v1
         with:
@@ -50,10 +46,6 @@ jobs:
         id: version
         shell: bash
         run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/v}
-      - name: Get file name
-        id: file
-        shell: bash
-        run: echo ::set-output name=FILE::${{ steps.version.outputs.VERSION }}.jar
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
@@ -92,4 +84,4 @@ jobs:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_REGION: us-west-2
-        run: aws s3 cp ./java/target/hyperbuild-${{ steps.version.outputs.VERSION }}.jar s3://${{ secrets.AWS_S3_BUCKET }}/hyperbuild/bin/${{ steps.file.outputs.FILE }}
+        run: aws s3 cp ./java/target/hyperbuild-${{ steps.version.outputs.VERSION }}.jar s3://${{ secrets.AWS_S3_BUCKET }}/hyperbuild/bin/${{ steps.version.outputs.VERSION }}.jar
diff --git a/ruby/hyperbuild.gemspec b/ruby/hyperbuild.gemspec
index f8ce0c7..490b5d6 100644
--- a/ruby/hyperbuild.gemspec
+++ b/ruby/hyperbuild.gemspec
@@ -2,7 +2,7 @@ require 'rake'
 
 Gem::Specification.new do |spec|
   spec.name          = "hyperbuild"
-  spec.version       = "0.0.24",
+  spec.version       = "0.0.24"
   spec.authors       = ["Wilson Lin"]
   spec.email         = ["code@wilsonl.in"]
   spec.license       = "MIT"
diff --git a/version b/version
index 19d18dc..b060402 100755
--- a/version
+++ b/version
@@ -61,7 +61,7 @@ for (const f of ["nodejs/package.json"]) {
 }
 
 for (const f of ["ruby/hyperbuild.gemspec"]) {
-  replaceInFile(f, /^(\s*spec\.version\s*=\s*)"\d+\.\d+\.\d+"\s*$/m, `$1"${NEW_VERSION}",`);
+  replaceInFile(f, /^(\s*spec\.version\s*=\s*)"\d+\.\d+\.\d+"\s*$/m, `$1"${NEW_VERSION}"`);
 }
 
 for (const f of ["java/pom.xml"]) {