diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8ab7873..30721dd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ permissions: jobs: rust-lint: - runs-on: sfdc-hk-ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 @@ -25,7 +25,7 @@ jobs: run: cargo fmt -- --check rust-unit-test: - runs-on: sfdc-hk-ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 @@ -37,7 +37,7 @@ jobs: run: cargo test --locked rust-integration-test: - runs-on: sfdc-hk-ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 diff --git a/buildpacks/website-ember/tests/integration_test.rs b/buildpacks/website-ember/tests/integration_test.rs index c62262a..5c8b447 100644 --- a/buildpacks/website-ember/tests/integration_test.rs +++ b/buildpacks/website-ember/tests/integration_test.rs @@ -54,7 +54,7 @@ fn ember_cli_app() { let log_output = container.logs_now(); assert_contains!(log_output.stderr, "release-phase plan"); assert_contains!( - log_output.stdout, + log_output.stderr, format!("save-release-artifacts writing archive: release-{unique}.tgz") .as_str() ); diff --git a/meta-buildpacks/website-nodejs/README.md b/meta-buildpacks/website-nodejs/README.md index ba68321..a5219f6 100644 --- a/meta-buildpacks/website-nodejs/README.md +++ b/meta-buildpacks/website-nodejs/README.md @@ -34,18 +34,30 @@ pack build \ # Execute Release Build docker run --entrypoint release \ - --env STATIC_ARTIFACTS_URL=file:///static-artifacts \ + --env STATIC_ARTIFACTS_URL=file:///workspace/artifact-storage \ + --volume /artifact-storage:/workspace/artifact-storage \ --env RELEASE_ID=v1 \ - --volume /static-artifacts:/workspace/static-artifacts \ # Launch Web Server docker run \ - --env STATIC_ARTIFACTS_URL=file:///static-artifacts \ - --env RELEASE_ID=v1 \ --env PORT=8888 -p 8888:8888 \ - --volume /static-artifacts:/workspace/static-artifacts \ + --env STATIC_ARTIFACTS_URL=file:///workspace/artifact-storage \ + --volume /artifact-storage:/workspace/artifact-storage \ + --env RELEASE_ID=v1 \ + + +# Interactively inspect release artifacts +docker run \ + --env STATIC_ARTIFACTS_URL=file:///workspace/artifact-storage \ + --volume /artifact-storage:/workspace/artifact-storage \ + --env RELEASE_ID=v1 \ + -it --entrypoint bash \ +# Run artifact loader +$ /layers/heroku_release-phase/main/exec.d/web/load-release-artifacts +# Inspect artifacts +$ ls -hal static-artifacts ``` ## Configuration diff --git a/meta-buildpacks/website-nodejs/buildpack.toml b/meta-buildpacks/website-nodejs/buildpack.toml index ba3c337..eb729ba 100644 --- a/meta-buildpacks/website-nodejs/buildpack.toml +++ b/meta-buildpacks/website-nodejs/buildpack.toml @@ -18,7 +18,7 @@ version = "1.0.3" [[order.group]] id = "heroku/nodejs" -version = "3.3.1" +version = "3.3.5" [[order.group]] id = "heroku/static-web-server" diff --git a/meta-buildpacks/website-nodejs/package.toml b/meta-buildpacks/website-nodejs/package.toml index 2eeed59..55b459f 100644 --- a/meta-buildpacks/website-nodejs/package.toml +++ b/meta-buildpacks/website-nodejs/package.toml @@ -5,10 +5,10 @@ uri = "." uri = "libcnb:heroku/website-ember" [[dependencies]] -uri = "urn:cnb:registry:heroku/nodejs@3.3.1" +uri = "docker://heroku/buildpack-nodejs:3.3.5" [[dependencies]] uri = "libcnb:heroku/static-web-server" [[dependencies]] -uri = "urn:cnb:registry:heroku/release-phase" +uri = "docker://heroku/buildpack-release-phase:1.0.3" diff --git a/meta-buildpacks/website/package.toml b/meta-buildpacks/website/package.toml index 8cba187..3bd0553 100644 --- a/meta-buildpacks/website/package.toml +++ b/meta-buildpacks/website/package.toml @@ -8,4 +8,4 @@ uri = "libcnb:heroku/website-public-html" uri = "libcnb:heroku/static-web-server" [[dependencies]] -uri = "urn:cnb:registry:heroku/release-phase" +uri = "docker://heroku/buildpack-release-phase:1.0.3"