Skip to content

Commit 9e64b44

Browse files
authored
Fix output directory in GitHub Actions (#48)
* Remove unused dependencies * Add comments * Add links to README * Fix output directory
1 parent b54075e commit 9e64b44

File tree

8 files changed

+14
-11
lines changed

8 files changed

+14
-11
lines changed

.github/workflows/build_jruby.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
run: cargo run --bin jruby_check -- --version ${{inputs.jruby_version}} --base-image ${{matrix.base_image}} --arch amd64 | tee $GITHUB_STEP_SUMMARY
4848
- name: Upload Ruby runtime archive to S3 dry run
4949
if: (inputs.dry_run)
50-
run: aws s3 sync ./builds "s3://${S3_BUCKET}" --dryrun
50+
run: aws s3 sync ./output "s3://${S3_BUCKET}" --dryrun
5151
- name: Upload Ruby runtime archive to S3 production
5252
if: (!inputs.dry_run)
53-
run: aws s3 sync ./builds "s3://${S3_BUCKET}"
53+
run: aws s3 sync ./output "s3://${S3_BUCKET}"

.github/workflows/build_ruby.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
run: cargo run --bin ruby_check -- --version ${{inputs.ruby_version}} --base-image ${{matrix.base_image}} --arch ${{matrix.arch}} | tee $GITHUB_STEP_SUMMARY
5353
- name: Upload Ruby runtime archive to S3 dry run
5454
if: (inputs.dry_run)
55-
run: aws s3 sync ./builds "s3://${S3_BUCKET}" --dryrun
55+
run: aws s3 sync ./output "s3://${S3_BUCKET}" --dryrun
5656
- name: Upload Ruby runtime archive to S3 production
5757
if: (!inputs.dry_run)
58-
run: aws s3 sync ./builds "s3://${S3_BUCKET}"
58+
run: aws s3 sync ./output "s3://${S3_BUCKET}"

Cargo.lock

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@ This repo contains scripts to build binaries locally and on GitHub Actions.
44

55
## Building with GitHub actions
66

7-
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.
7+
Navigate to GithHub actions. Select the workflow:
8+
9+
- [Build Ruby](https://github.com/heroku/docker-heroku-ruby-builder/actions/workflows/build_ruby.yml)
10+
- [Build JRuby](https://github.com/heroku/docker-heroku-ruby-builder/actions/workflows/build_jruby.yml)
11+
12+
Then click the drop down "Run workflow" and enter the desired Ruby version.
813

914
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.
1015

jruby_executable/src/lib.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
/// Short: This script parses a file based on the input jruby version to determine
1+
// See `bin/*.rs` for scripts
2+
3+
/// Short: This struct parses a file based on the input jruby version to determine
24
/// what Ruby version it targets.
35
///
46
/// If you run this script with `9.4.3.0` it will return 3.1.4

ruby_executable/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ edition = "2021"
77
clap = { workspace = true}
88
shared = { workspace = true}
99
indoc = { workspace = true}
10-
lazy_static = { workspace = true}
1110
flate2 = { workspace = true}
1211
fs-err = { workspace = true}
1312
fun_run = { workspace = true}

ruby_executable/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1+
// See `bin/*.rs` for scripts

shared/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ edition = "2021"
77
glob = { workspace = true}
88
clap = { workspace = true}
99
indoc = { workspace = true}
10-
lazy_static = { workspace = true}
1110
flate2 = { workspace = true}
1211
fs-err = { workspace = true}
1312
fun_run = { workspace = true}

0 commit comments

Comments
 (0)