diff --git a/.github/workflows/build_jruby.yml b/.github/workflows/build_jruby.yml index 3bac142..9ee44d3 100644 --- a/.github/workflows/build_jruby.yml +++ b/.github/workflows/build_jruby.yml @@ -47,7 +47,7 @@ jobs: run: cargo run --bin jruby_check -- --version ${{inputs.jruby_version}} --base-image ${{matrix.base_image}} --arch amd64 | tee $GITHUB_STEP_SUMMARY - name: Upload Ruby runtime archive to S3 dry run if: (inputs.dry_run) - run: aws s3 sync ./builds "s3://${S3_BUCKET}" --dryrun + run: aws s3 sync ./output "s3://${S3_BUCKET}" --dryrun - name: Upload Ruby runtime archive to S3 production if: (!inputs.dry_run) - run: aws s3 sync ./builds "s3://${S3_BUCKET}" + run: aws s3 sync ./output "s3://${S3_BUCKET}" diff --git a/.github/workflows/build_ruby.yml b/.github/workflows/build_ruby.yml index 58e43c1..e9a49bf 100644 --- a/.github/workflows/build_ruby.yml +++ b/.github/workflows/build_ruby.yml @@ -52,7 +52,7 @@ jobs: run: cargo run --bin ruby_check -- --version ${{inputs.ruby_version}} --base-image ${{matrix.base_image}} --arch ${{matrix.arch}} | tee $GITHUB_STEP_SUMMARY - name: Upload Ruby runtime archive to S3 dry run if: (inputs.dry_run) - run: aws s3 sync ./builds "s3://${S3_BUCKET}" --dryrun + run: aws s3 sync ./output "s3://${S3_BUCKET}" --dryrun - name: Upload Ruby runtime archive to S3 production if: (!inputs.dry_run) - run: aws s3 sync ./builds "s3://${S3_BUCKET}" + run: aws s3 sync ./output "s3://${S3_BUCKET}" diff --git a/Cargo.lock b/Cargo.lock index 0778567..858d91c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -933,7 +933,6 @@ dependencies = [ "fs-err", "fun_run", "indoc", - "lazy_static", "nom", "regex", "reqwest", @@ -1070,7 +1069,6 @@ dependencies = [ "fun_run", "glob", "indoc", - "lazy_static", "nom", "regex", "reqwest", diff --git a/README.md b/README.md index 6085f27..3bac688 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,12 @@ This repo contains scripts to build binaries locally and on GitHub Actions. ## Building with GitHub actions -Navigate to GithHub actions. Select the workflow "Build and upload (j?)Ruby runtime" then click the drop down "Run workflow" and enter the desired Ruby version. This will trigger a build for all supported stacks. If a version is not supported on a specific stack, add that logic to the `inside_docker/*.rs` file and to the GitHub action yaml logic. +Navigate to GithHub actions. Select the workflow: + +- [Build Ruby](https://github.com/heroku/docker-heroku-ruby-builder/actions/workflows/build_ruby.yml) +- [Build JRuby](https://github.com/heroku/docker-heroku-ruby-builder/actions/workflows/build_jruby.yml) + +Then click the drop down "Run workflow" and enter the desired Ruby version. Employees of Heroku see: [The Ruby language guides](https://github.com/heroku/languages-team/tree/main/languages/ruby) (not public) for additional details on building and deploying Ruby versions. diff --git a/jruby_executable/src/lib.rs b/jruby_executable/src/lib.rs index 831f0f4..6f33d5d 100644 --- a/jruby_executable/src/lib.rs +++ b/jruby_executable/src/lib.rs @@ -1,4 +1,6 @@ -/// Short: This script parses a file based on the input jruby version to determine +// See `bin/*.rs` for scripts + +/// Short: This struct parses a file based on the input jruby version to determine /// what Ruby version it targets. /// /// If you run this script with `9.4.3.0` it will return 3.1.4 diff --git a/ruby_executable/Cargo.toml b/ruby_executable/Cargo.toml index 9fbb4f2..b0185e0 100644 --- a/ruby_executable/Cargo.toml +++ b/ruby_executable/Cargo.toml @@ -7,7 +7,6 @@ edition = "2021" clap = { workspace = true} shared = { workspace = true} indoc = { workspace = true} -lazy_static = { workspace = true} flate2 = { workspace = true} fs-err = { workspace = true} fun_run = { workspace = true} diff --git a/ruby_executable/src/lib.rs b/ruby_executable/src/lib.rs index 8b13789..887a951 100644 --- a/ruby_executable/src/lib.rs +++ b/ruby_executable/src/lib.rs @@ -1 +1 @@ - +// See `bin/*.rs` for scripts diff --git a/shared/Cargo.toml b/shared/Cargo.toml index b7cc8f2..1072bf5 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -7,7 +7,6 @@ edition = "2021" glob = { workspace = true} clap = { workspace = true} indoc = { workspace = true} -lazy_static = { workspace = true} flate2 = { workspace = true} fs-err = { workspace = true} fun_run = { workspace = true}