Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix output directory in GitHub Actions #48

Merged
merged 5 commits into from
Jul 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build_jruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
4 changes: 2 additions & 2 deletions .github/workflows/build_ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
2 changes: 0 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
4 changes: 3 additions & 1 deletion jruby_executable/src/lib.rs
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion ruby_executable/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion ruby_executable/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1 +1 @@

// See `bin/*.rs` for scripts
1 change: 0 additions & 1 deletion shared/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
Loading