Migrate from CircleCI to GHA (#397)

.github/workflows/ci.yml

@@ -0,0 +1,97 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+permissions:
+  contents: read
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  lint:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Update Rust toolchain
+        run: rustup update
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@v2
+      - name: Clippy
+        run: cargo clippy --all-targets --locked -- --deny warnings
+      - name: rustfmt
+        run: cargo fmt -- --check
+
+  unit-test:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Update Rust toolchain
+        run: rustup update
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@v2
+      - name: Run unit tests
+        run: cargo test --locked
+
+  libcnb-test:
+    name: Cargo integration tests (${{ matrix.integration-test-cnb-builder }})
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        integration-test-cnb-builder: [ "heroku/buildpacks:20", "heroku/builder:22" ]
+    env:
+      INTEGRATION_TEST_CNB_BUILDER: ${{ matrix.integration-test-cnb-builder }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Install musl-tools
+        run: sudo apt-get install musl-tools --no-install-recommends
+      - name: Update Rust toolchain
+        run: rustup update
+      - name: Install Rust linux-musl target
+        run: rustup target add x86_64-unknown-linux-musl
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@v2
+      - name: Install Pack CLI
+        uses: buildpacks/github-actions/[email protected]
+      - name: Run integration tests
+        # Runs only tests annotated with the `ignore` attribute (which in this repo, are the integration tests).
+        run: cargo test --locked -- --ignored
+
+  cutlass-test:
+    name: Cutlass (${{ matrix.spec-dir }} on ${{ matrix.integration-test-cnb-builder }})
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        integration-test-cnb-builder: ["heroku/buildpacks:20", "heroku/builder:22"]
+        spec-dir: ["test/specs/java", "test/specs/java-function"]
+    env:
+      INTEGRATION_TEST_CNB_BUILDER: ${{ matrix.integration-test-cnb-builder }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Install musl-tools
+        run: sudo apt-get install musl-tools --no-install-recommends
+      - name: Update Rust toolchain
+        run: rustup update
+      - name: Install Rust linux-musl target
+        run: rustup target add x86_64-unknown-linux-musl
+      - name: Rust Cache
+        uses: Swatinem/rust-cache@v2
+      - name: Install libcnb-cargo
+        run: cargo install libcnb-cargo
+      - name: Install Pack CLI
+        uses: buildpacks/github-actions/[email protected]
+      - name: Install Ruby and dependencies
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: "2.7"
+      - name: Run integration tests
+        run: bundle exec rspec ${{ matrix.spec-dir }}

README.md

@@ -1,5 +1,5 @@
 # Heroku Cloud Native JVM Buildpacks
-[![CircleCI](https://circleci.com/gh/heroku/buildpacks-jvm/tree/main.svg?style=shield)](https://circleci.com/gh/heroku/buildpacks-jvm/tree/main)
+[![CI](https://github.com/heroku/buildpacks-jvm/actions/workflows/ci.yml/badge.svg)](https://github.com/heroku/buildpacks-jvm/actions/workflows/ci.yml)
 
 Heroku's official [Cloud Native Buildpacks](https://buildpacks.io) for the JVM ecosystem.
 

buildpacks/jvm-function-invoker/src/common.rs

@@ -4,7 +4,7 @@ use std::path::Path;
 use toml::Value;
 
 pub fn project_toml_salesforce_type_is_function(project_toml_path: &Path) -> bool {
-    read_toml_file(&project_toml_path)
+    read_toml_file(project_toml_path)
         .ok()
         .and_then(|table: Value| {
             toml_select_value(vec!["com", "salesforce", "type"], &table)

buildpacks/jvm-function-invoker/src/layers/bundle.rs

@@ -55,7 +55,7 @@ impl Layer for BundleLayer {
 
         match exit_status.code() {
             Some(0) => {
-                log_function_metadata(&layer_path)?;
+                log_function_metadata(layer_path)?;
                 LayerResultBuilder::new(GenericMetadata::default())
                     .env(LayerEnv::new().chainable_insert(
                         Scope::All,

buildpacks/jvm-function-invoker/src/main.rs

@@ -97,7 +97,7 @@ impl Buildpack for JvmFunctionInvokerBuildpack {
     }
 
     fn on_error(&self, error: libcnb::Error<Self::Error>) {
-        on_error(handle_buildpack_error, error)
+        on_error(handle_buildpack_error, error);
     }
 }
 

buildpacks/jvm/src/bin/heroku_database_env_var_rewrite.rs

@@ -9,6 +9,7 @@ use libcnb::exec_d::write_exec_d_program_output;
 use std::collections::HashMap;
 use url::Url;
 
+#[allow(clippy::missing_panics_doc)]
 pub fn main() {
     write_exec_d_program_output(
         jvm_env_vars_for_env(&std::env::vars().collect())
@@ -352,7 +353,7 @@ mod test {
             String::from("postgres://pooluser:[email protected]:5432/testdb"),
         )]));
 
-        assert_eq!(result, HashMap::new())
+        assert_eq!(result, HashMap::new());
     }
 
     #[test]
@@ -466,7 +467,7 @@ mod test {
             String::from("postgres://test123@ec2-52-13-12"),
         )]));
 
-        assert_eq!(result, HashMap::new())
+        assert_eq!(result, HashMap::new());
     }
 
     #[test]

buildpacks/jvm/src/layers/openjdk.rs

@@ -52,7 +52,7 @@ impl Layer for OpenJdkLayer {
         std::fs::File::open(&path)
             .map_err(OpenJdkBuildpackError::CannotOpenOpenJdkTarball)
             .and_then(|mut file| {
-                libherokubuildpack::tar::decompress_tarball(&mut file, &layer_path)
+                libherokubuildpack::tar::decompress_tarball(&mut file, layer_path)
                     .map_err(OpenJdkBuildpackError::CannotDecompressOpenJdkTarball)
             })?;
 
@@ -68,11 +68,11 @@ impl Layer for OpenJdkLayer {
 
         let symlink_ubuntu_java_cacerts_file = ubuntu_java_cacerts_file_path.is_file()
             && !app_jdk_overlay_dir_path
-                .join(&relative_jdk_cacerts_path)
+                .join(relative_jdk_cacerts_path)
                 .exists();
 
         if symlink_ubuntu_java_cacerts_file {
-            let absolute_jdk_cacerts_path = layer_path.join(&relative_jdk_cacerts_path);
+            let absolute_jdk_cacerts_path = layer_path.join(relative_jdk_cacerts_path);
 
             fs::rename(
                 &absolute_jdk_cacerts_path,
@@ -95,7 +95,7 @@ impl Layer for OpenJdkLayer {
 
             fs_extra::copy_items(
                 &jdk_overlay_contents,
-                &layer_path,
+                layer_path,
                 &CopyOptions {
                     overwrite: true,
                     skip_exist: false,
@@ -116,7 +116,7 @@ impl Layer for OpenJdkLayer {
                     Scope::All,
                     ModificationBehavior::Override,
                     "JAVA_HOME",
-                    &layer_path,
+                    layer_path,
                 )
                 .chainable_insert(
                     Scope::All,

buildpacks/jvm/src/version.rs

@@ -8,13 +8,13 @@ pub fn normalize_version_string<S: Into<String>>(
 ) -> Result<(OpenJDKDistribution, String), NormalizeVersionStringError> {
     let user_version_string = user_version_string.into();
 
-    let (user_distribution_string, user_version_string) = user_version_string
-        .trim()
-        .split_once("-")
-        .map(|(split_distribution_string, split_version_string)| {
-            (Some(split_distribution_string), split_version_string)
-        })
-        .unwrap_or((None, &user_version_string));
+    let (user_distribution_string, user_version_string) =
+        user_version_string.trim().split_once('-').map_or(
+            (None, user_version_string.as_str()),
+            |(split_distribution_string, split_version_string)| {
+                (Some(split_distribution_string), split_version_string)
+            },
+        );
 
     let version_string = match user_version_string {
         "7" | "1.7" => "1.7.0_352",
@@ -34,8 +34,8 @@ pub fn normalize_version_string<S: Into<String>>(
     };
 
     match user_distribution_string {
-        None => Ok(default_distribution(&stack_id)),
-        Some("heroku") | Some("openjdk") => Ok(OpenJDKDistribution::Heroku),
+        None => Ok(default_distribution(stack_id)),
+        Some("heroku" | "openjdk") => Ok(OpenJDKDistribution::Heroku),
         Some("zulu") => Ok(OpenJDKDistribution::AzulZulu),
         Some(unknown) => Err(NormalizeVersionStringError::UnknownDistribution(
             String::from(unknown),

buildpacks/jvm/tests/integration_tests.rs

@@ -1,6 +1,7 @@
 use libcnb_test::{assert_contains, BuildConfig, TestRunner};
 
 #[test]
+#[ignore = "integration test"]
 fn test() {
     let builder_name = std::env::var("INTEGRATION_TEST_CNB_BUILDER").unwrap();
 

buildpacks/maven/README.md

@@ -1,5 +1,5 @@
 # Heroku Cloud Native Maven Buildpack
-[![CircleCI](https://circleci.com/gh/heroku/buildpacks-jvm/tree/main.svg?style=shield)](https://circleci.com/gh/heroku/buildpacks-jvm/tree/main)
+[![CI](https://github.com/heroku/buildpacks-jvm/actions/workflows/ci.yml/badge.svg)](https://github.com/heroku/buildpacks-jvm/actions/workflows/ci.yml)
 [![Registry](https://img.shields.io/badge/dynamic/json?url=https://registry.buildpacks.io/api/v1/buildpacks/heroku/maven&label=version&query=$.latest.version&color=DF0A6B&logo=data:image/png;base64,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&labelColor=white)](https://registry.buildpacks.io/buildpacks/heroku/maven)
 
 Heroku's official Cloud Native Buildpack for [Apache Maven](https://maven.apache.org/).