Update GHA CI and remove shunit tests (#189)

Author: Malax

.github/workflows/ci.yml

@@ -10,9 +10,26 @@ permissions:
   contents: read
 
 jobs:
+  lint:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+      - name: Install Ruby and dependencies
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: "3.4"
+      - name: Install shfmt
+        run: sudo apt-get install shfmt
+      - run: make lint-scripts
+      - run: make check-format
+      - run: make lint-ruby
+
   hatchet:
     name: "Hatchet (${{ matrix.stack }})"
     runs-on: ubuntu-22.04
+    needs: lint
     strategy:
       fail-fast: false
       matrix:
@@ -42,42 +59,3 @@ jobs:
         run: bundle exec hatchet ci:setup
       - name: Run Hatchet integration tests
         run: bundle exec parallel_split_test test/spec/
-
-  buildpack-testrunner:
-    runs-on: ubuntu-22.04
-    env:
-      SHUNIT_HOME: /tmp/shunit2-2.1.6
-      # Note the missing STACK environment variable here. This works since there is a default value in the buildpack
-      # source. I ported this as-is from the Travis config. Given we're trying to get rid of testrunner entirely,
-      # it will stay like this. If we, for some reason, decide to keep testrunner, we should look into a fixed STACK env var.
-    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-java@v5
-        with:
-          distribution: zulu
-          java-version: 8
-      - name: Download and unpack shunit 2.1.6
-        run: curl -sSf --retry 3 --retry-connrefused --connect-timeout 5 https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/shunit2/shunit2-2.1.6.tgz | tar xz -C /tmp/
-      - name: Clone heroku-buildpack-testrunner
-        run: git clone https://github.com/heroku/heroku-buildpack-testrunner.git /tmp/testrunner
-      - name:  Apply heroku-buildpack-testrunner patches to enforce bash shell
-        run:  |
-          cd /tmp/testrunner
-          git apply <<'EOF'
-          diff --git a/bin/run b/bin/run
-          index 0d5b790..a0ff25c 100755
-          --- a/bin/run
-          +++ b/bin/run
-          @@ -101,7 +101,7 @@ for bp in ${@}; do
-               suite_start_time="$(date +%s)"
-          
-               echo "  TEST SUITE: $(basename ${f})"
-          -    ${SHUNIT_HOME?"'SHUNIT_HOME' environment variable must be set"}/src/shunit2 ${f} | indent
-          +    /bin/bash ${SHUNIT_HOME?"'SHUNIT_HOME' environment variable must be set"}/src/shunit2 ${f} | indent
-               exit_code=$(max ${exit_code} ${PIPESTATUS[0]})
-          
-               suite_end_time="$(date +%s)"
-          
-          EOF
-      - name: Execute buildpack-testrunner
-        run: /tmp/testrunner/bin/run .

Makefile

@@ -2,7 +2,7 @@
 .PHONY: lint lint-scripts lint-ruby check-format format run publish
 
 STACK ?= heroku-24
-FIXTURE ?= test/spec/fixtures/repos/clojure-minimal
+FIXTURE ?= test/spec/fixtures/repos/lein-2.x-with-uberjar
 
 # Converts a stack name of `heroku-NN` to its build Docker image tag of `heroku/heroku:NN-build`.
 STACK_IMAGE_TAG := heroku/$(subst -,:,$(STACK))-build

test/lein_test.sh

@@ -332,13 +332,13 @@
   it 'uses custom bin/build script when present' do
     new_default_hatchet_runner('lein-2.x-with-uberjar').tap do |app|
       app.before_deploy do
-        Dir.mkdir('bin') unless Dir.exist?('bin')
+        FileUtils.mkdir_p('bin')
         File.write('bin/build', <<~SCRIPT)
           #!/usr/bin/env bash
           echo "Running custom build script"
           lein deps
         SCRIPT
-        File.chmod(0755, 'bin/build')
+        File.chmod(0o755, 'bin/build')
       end
 
       app.deploy do
@@ -353,14 +353,14 @@
     buildpack_root = File.expand_path('../..', __dir__)
     new_default_hatchet_runner('lein-2.x-with-uberjar').tap do |app|
       app.before_deploy do
-        Dir.mkdir('bin') unless Dir.exist?('bin')
+        FileUtils.mkdir_p('bin')
         # Create a working lein script based on opt/lein2
         lein_template_path = File.join(buildpack_root, 'opt/lein2')
         lein_content = File.read(lein_template_path)
         # Replace the version placeholder with actual version
         lein_content.gsub!('##LEIN_VERSION##', '2.9.1')
         File.write('bin/lein', lein_content)
-        File.chmod(0755, 'bin/lein')
+        File.chmod(0o755, 'bin/lein')
       end
 
       app.deploy do

test/spec/compile_spec.rb

@@ -30,7 +30,9 @@
 
         # Verify lein is available
         lein_output = app.run('lein version')
-        expect(lein_output).to match(/Downloading Leiningen to \/app\/\.lein\/self-installs\/leiningen-\d+\.\d+\.\d+-standalone\.jar now\.\.\./)
+        expect(lein_output).to match(
+          %r{Downloading Leiningen to /app/\.lein/self-installs/leiningen-\d+\.\d+\.\d+-standalone\.jar now\.\.\.}
+        )
         expect(lein_output).to match(/Leiningen \d+\.\d+\.\d+ on Java \d+\.\d+\.\d+ OpenJDK 64-Bit Server VM/)
       end
     end

test/spec/runtime_spec.rb

@@ -43,7 +43,7 @@ def http_get(app, options = {})
   retry_limit = options[:retry_limit] || 50
   path = options[:path] ? "/#{options[:path]}" : ''
   Excon.get("#{app.platform_api.app.info(app.name).fetch('web_url')}#{path}", idempotent: true, expects: 200,
-            retry_limit: retry_limit).body
+                                                                              retry_limit: retry_limit).body
 end
 
 def find_output_start_index(lines)
@@ -62,6 +62,7 @@ def find_output_end_index(lines)
   [success_end_index, failure_end_index].compact.first
 end
 
+# rubocop:disable Metrics/MethodLength, Layout/LineLength
 def clean_output(output)
   # Remove output from the build system before and after the actual build
   lines = output.lines
@@ -95,7 +96,7 @@ def clean_output(output)
     # Clojure / Leiningen
     ##################################################
     # Maven/Leiningen dependency retrieval (normalize non-deterministic download order)
-    /Retrieving [\w\/\.\-]+\.(pom|jar) from \w+/ => 'Retrieving $DEPENDENCY from $REPO',
+    %r{Retrieving [\w/.-]+\.(pom|jar) from \w+} => 'Retrieving $DEPENDENCY from $REPO',
     # Jetty logging timestamp
     /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+:INFO::main: Logging initialized @\d+ms/ => '$TIMESTAMP:INFO::main: Logging initialized @$TIMEms',
 
@@ -115,3 +116,4 @@ def clean_output(output)
 
   output
 end
+# rubocop:enable Metrics/MethodLength, Layout/LineLength