java and ruby release method (#234)

fundthmcalculus · web-flow · commit 5aecc5afff2a · 2021-10-29T14:25:54.000-04:00
diff --git a/.github/workflows/build-java.yml b/.github/workflows/build-java.yml
@@ -35,8 +35,10 @@ jobs:
           path: ./libs
       - name: Build with Gradle
         run: |
-          ./devops/BuildJava.ps1 -GitTag ${{ github.ref }} -TestOutput "test_output.xml" -ArtifactName "${{ matrix.os-artifact[1] }}"
+          python ../devops/build_sdks.py --github-token=${{ secrets.API_GITHUB_TOKEN }}
+          gradle build
         shell: pwsh
+        working-directory: java
       - name: Upload Unit Test Results - Java
         if: always()
         uses: actions/upload-artifact@v2
diff --git a/.github/workflows/build-ruby.yml b/.github/workflows/build-ruby.yml
@@ -32,8 +32,15 @@ jobs:
           workflow: "build-libs.yml"
           path: ./libs
       - name: Build and run tests
-        run: ./devops/BuildRuby.ps1 -GitTag ${{ github.ref }} -TestOutput "test_output.xml" -ArtifactName "${{ matrix.os-artifact[1] }}"
+        run: |
+          gem install bundler
+          gem install rspec
+          bundle install
+          python ../devops/build_sdks.py --github-token=${{ secrets.API_GITHUB_TOKEN }}
+          bundle exec rake
+          rake test
         shell: pwsh
+        working-directory: ruby
       - name: Upload Unit Test Results - Ruby
         if: always()
         uses: actions/upload-artifact@v2
diff --git a/.github/workflows/release-java.yml b/.github/workflows/release-java.yml
@@ -2,8 +2,13 @@ name: Release Java Maven Package
 
 on:
   workflow_dispatch:
-  push:
-    branches: [ main ]
+  # release:
+  #   types: [published]
+  workflow_run:
+    workflows: ["Release Platform Libraries"]
+    branches: [main, "v?.*"]
+    types:
+      - completed
 
 jobs:
   build:
diff --git a/.github/workflows/release-python.yml b/.github/workflows/release-python.yml
@@ -32,8 +32,7 @@ jobs:
           python ../devops/build_sdks.py --github-token=${{ secrets.API_GITHUB_TOKEN }}
           python -m build --sdist --wheel --outdir dist/ .
         shell: pwsh
-        with:
-          path: python
+        working-directory: python
       - name: Publish distribution 📦 to PyPI
         uses: pypa/gh-action-pypi-publish@master
         with:
diff --git a/.github/workflows/release-ruby.yml b/.github/workflows/release-ruby.yml
@@ -2,13 +2,13 @@ name: Release Ruby Gem
 
 on:
   workflow_dispatch:
-    inputs:
-      version:
-        description: 'Package version - SemVer compliant [N!]N(.N)*[{a|b|rc}N]'
-        required: true
-        default: ' '
-  push:
-    branches: [ main ]
+  # release:
+  #   types: [published]
+  workflow_run:
+    workflows: ["Release Platform Libraries"]
+    branches: [main, "v?.*"]
+    types:
+      - completed
 
 jobs:
   build:
@@ -30,9 +30,14 @@ jobs:
           workflow: "build-libs.yml"
           path: ./libs
           branch: main
-      - name: Install dependencies
-        run: ./devops/BuildRuby.ps1 -GitTag "${{ github.ref }}" -PackageVersion "${{ github.event.inputs.version }}"
+      - name: Build and run tests
+        run: |
+          gem install bundler
+          bundle install
+          python ../devops/build_sdks.py --github-token=${{ secrets.API_GITHUB_TOKEN }}
+          gem build *.gemspec
         shell: pwsh
+        working-directory: ruby
       - name: Publish gem
         uses: dawidd6/action-publish-gem@v1.2.0
         with:
diff --git a/devops/BuildJava.ps1 b/devops/BuildJava.ps1
diff --git a/devops/build_sdks.py b/devops/build_sdks.py
@@ -47,6 +47,22 @@ def build_python(args) -> None:
     copy_okapi_libs(join(python_dir, 'okapi', 'libs'))
 
 
+def build_java(args) -> None:
+    # Update version in setup.cfg
+    java_dir = abspath(join(dirname(__file__), '..', 'java'))
+    update_line(join(java_dir, 'build.gradle'),
+                {'def jarVersion': f'def jarVersion = {get_github_version(args.github_token)}'})
+
+
+def build_ruby(args) -> None:
+    # Update version in setup.cfg
+    ruby_dir = abspath(join(dirname(__file__), '..', 'ruby'))
+    update_line(join(ruby_dir, 'lib', 'version.rb'),
+                {'  VERSION =': f'  VERSION = {get_github_version(args.github_token)}'})
+    # Copy in the binaries
+    copy_okapi_libs(join(ruby_dir, 'libs'))
+
+
 def get_github_version(github_token: str = None) -> str:
     github_release_request = requests.get('https://api.github.com/repos/trinsic-id/okapi/releases/latest',
                                           headers={'Authorization': github_token})
