Clean up GHA

Author: ronaldtse

.github/workflows/assets.yml

@@ -16,16 +16,20 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: interscript/interscript
-      - name: Run a bootstrap script
+
+      - name: Run bootstrap script
         run: ruby bootstrap.rb
+
       - name: Use Ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: 3.0
           bundler-cache: true
-          working-directory: ./ruby
+
       - name: Generate visualization json
-        run: pushd ruby; bundle exec rake generate_visualization_json; popd
+        working-directory: ./ruby
+        run: bundle exec rake generate_visualization_json
+
       - name: Archive json files from the previous step
         uses: thedoctor0/zip-release@master
         with:
@@ -34,6 +38,7 @@ jobs:
           directory: ./ruby/
           exclusions: '*.git*'
           type: zip
+
       - name: Upload artifacts
         id: upload_vis_json
         uses: svenstaro/upload-release-action@2.2.1
@@ -43,8 +48,11 @@ jobs:
           file_glob: true
           tag: ${{ github.ref }}
           overwrite: true
+
       - name: Generate metadata
-        run: pushd ruby; bundle exec rake generate_metadata_json; popd
+        working-directory: ./ruby
+        run: bundle exec rake generate_metadata_json
+
       - name: Archive metadata from the previous step
         uses: thedoctor0/zip-release@master
         with:
@@ -53,6 +61,7 @@ jobs:
           directory: ./ruby/
           exclusions: '*.git*'
           type: zip
+
       - name: Upload metadata
         id: upload_metadata
         uses: svenstaro/upload-release-action@2.2.1
@@ -62,11 +71,13 @@ jobs:
           asset_name: metadata.json.zip
           tag: ${{ github.ref }}
           overwrite: true
+
       - name: Output link
         run: |
           echo ${{ steps.upload_vis_json.outputs.browser_download_url }}
           echo ${{ steps.upload_metadata.outputs.browser_download_url }}
-#        - name: Trigger interscript.org
+
+#        - name: Trigger deploy at interscript.org
 #          uses: peter-evans/repository-dispatch@v1
 #          with:
 #            token: ${{ secrets.INTERSCRIPT_CI_TOKEN }}

.github/workflows/rake.yml

@@ -38,19 +38,17 @@ jobs:
         with:
           repository: interscript/interscript
 
-      - name: Run a bootstrap script
+      - name: Run bootstrap script
         run: ruby bootstrap.rb
 
       - name: Use Ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
-          working-directory: ./ruby
 
       - name: Run RSpecs
+        working-directory: ./ruby
         run: |
-          pushd ruby
           bundle install --with=jsexec
           bundle exec rspec -f f
-          popd

.github/workflows/release.yml

@@ -14,28 +14,30 @@ jobs:
         with:
           repository: interscript/interscript
 
-      - name: Run a bootstrap script
+      - name: Run bootstrap script
         run: ruby bootstrap.rb
 
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: '2.7'
-          architecture: 'x64'
-          working-directory: ./ruby
 
       - uses: actions/setup-node@v1
         with:
           node-version: 14.x
 
       # For now let's install without secryst, as we don't necessarily need it.
       # We may need to change it once we start to depend on secryst maps.
-      - run: pushd ruby && bundle install --jobs 4 --retry 3 --with jsexec --without secryst && popd
+      - name: Install bundle
+        working-directory: ./ruby
+        run: bundle install --jobs 4 --retry 3 --with jsexec --without secryst
 
-      - name: Test the Ruby package
-        run: pushd ruby && bundle exec rake && popd
+      - name: Test Ruby package
+        working-directory: ./ruby
+        run: bundle exec rake
 
-      - name: Test the JS package
-        run: pushd js && npm install && npm run prepareMaps && npm test && popd
+      - name: Test JS package
+        working-directory: ./js
+        run: npm install && npm run prepareMaps && npm test
 
       - name: Publish to rubygems.org
         env: