Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
laurentsimon committed Oct 20, 2022
1 parent 0f6d5c9 commit 0b41106
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/builder_go_slsa3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ jobs:
steps:
- name: Generate builder binary
id: generate
uses: slsa-framework/slsa-github-generator/.github/actions/generate-builder@3a3bee691c20c5c0ccc6bbd28df5e14bb7c63d53
uses: slsa-framework/slsa-github-generator/.github/actions/generate-builder@ae7b9550bb87beb718163df78e66ee8267b803ac
with:
repository: "${{ needs.detect-env.outputs.repository }}"
ref: "${{ needs.detect-env.outputs.ref }}"
Expand Down Expand Up @@ -145,7 +145,7 @@ jobs:
needs: [privacy-check, builder, rng]
steps:
- name: Checkout builder repository
uses: slsa-framework/slsa-github-generator/.github/actions/secure-builder-checkout@3a3bee691c20c5c0ccc6bbd28df5e14bb7c63d53
uses: slsa-framework/slsa-github-generator/.github/actions/secure-builder-checkout@ae7b9550bb87beb718163df78e66ee8267b803ac
with:
repository: "${{ needs.detect-env.outputs.repository }}"
ref: "${{ needs.detect-env.outputs.ref }}"
Expand Down Expand Up @@ -176,8 +176,8 @@ jobs:
# Note: this outputs information about resolved arguments, etc.
# the values are trusted because the compiler is not invoked.
echo "../$BUILDER_BINARY" build --dry "$CONFIG_FILE" "$UNTRUSTED_ENVS"
"../$BUILDER_BINARY" build --dry "$CONFIG_FILE" "$UNTRUSTED_ENVS"
echo "$GITHUB_WORKSPACE/$BUILDER_BINARY" build --dry "$CONFIG_FILE" "$UNTRUSTED_ENVS"
"$GITHUB_WORKSPACE/$BUILDER_BINARY" build --dry "$CONFIG_FILE" "$UNTRUSTED_ENVS"
###################################################################
# #
Expand All @@ -191,7 +191,7 @@ jobs:
needs: [privacy-check, builder, build-dry, rng]
steps:
- name: Checkout builder repository
uses: slsa-framework/slsa-github-generator/.github/actions/secure-builder-checkout@3a3bee691c20c5c0ccc6bbd28df5e14bb7c63d53
uses: slsa-framework/slsa-github-generator/.github/actions/secure-builder-checkout@ae7b9550bb87beb718163df78e66ee8267b803ac
with:
repository: "${{ needs.detect-env.outputs.repository }}"
ref: "${{ needs.detect-env.outputs.ref }}"
Expand Down Expand Up @@ -241,12 +241,12 @@ jobs:
# Disable set-output command.
echo "::stop-commands::`echo -n ${{ github.token }} | sha256sum | head -c 64`"
echo "../$BUILDER_BINARY" build "$CONFIG_FILE" "$UNTRUSTED_ENVS"
echo "$GITHUB_WORKSPACE/$BUILDER_BINARY" build "$CONFIG_FILE" "$UNTRUSTED_ENVS"
# Note: We need to provide the asbolute path to the output binary.
export OUTPUT_BINARY="$PWD/${{ env.GENERATED_BINARY_NAME }}"
../"$BUILDER_BINARY" build "$CONFIG_FILE" "$UNTRUSTED_ENVS"
"$GITHUB_WORKSPACE/$BUILDER_BINARY" build "$CONFIG_FILE" "$UNTRUSTED_ENVS"
mv "${{ env.GENERATED_BINARY_NAME }}" "../$UNTRUSTED_BINARY_NAME"
mv "${{ env.GENERATED_BINARY_NAME }}" "$GITHUB_WORKSPACE/$UNTRUSTED_BINARY_NAME"
- name: Upload generated binary
id: upload
Expand All @@ -272,7 +272,7 @@ jobs:
go-provenance-sha256: ${{ steps.sign-prov.outputs.signed-provenance-sha256 }}
steps:
- name: Checkout builder repository
uses: slsa-framework/slsa-github-generator/.github/actions/secure-builder-checkout@3a3bee691c20c5c0ccc6bbd28df5e14bb7c63d53
uses: slsa-framework/slsa-github-generator/.github/actions/secure-builder-checkout@ae7b9550bb87beb718163df78e66ee8267b803ac
with:
repository: "${{ needs.detect-env.outputs.repository }}"
ref: "${{ needs.detect-env.outputs.ref }}"
Expand Down Expand Up @@ -330,7 +330,7 @@ jobs:
if: startsWith(github.ref, 'refs/tags/') && inputs.upload-assets == true
steps:
- name: Checkout builder repository
uses: slsa-framework/slsa-github-generator/.github/actions/secure-builder-checkout@3a3bee691c20c5c0ccc6bbd28df5e14bb7c63d53
uses: slsa-framework/slsa-github-generator/.github/actions/secure-builder-checkout@ae7b9550bb87beb718163df78e66ee8267b803ac
with:
repository: "${{ needs.detect-env.outputs.repository }}"
ref: "${{ needs.detect-env.outputs.ref }}"
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/builder_node_slsa3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ jobs:
steps:
- name: Generate builder
id: generate
uses: slsa-framework/slsa-github-generator/.github/actions/generate-builder@3a3bee691c20c5c0ccc6bbd28df5e14bb7c63d53
uses: slsa-framework/slsa-github-generator/.github/actions/generate-builder@ae7b9550bb87beb718163df78e66ee8267b803ac
with:
repository: "${{ needs.detect-env.outputs.repository }}"
ref: "${{ needs.detect-env.outputs.ref }}"
Expand Down Expand Up @@ -203,7 +203,7 @@ jobs:
needs: [privacy-check, builder, rng]
steps:
- name: Checkout builder repository
uses: slsa-framework/slsa-github-generator/.github/actions/secure-builder-checkout@3a3bee691c20c5c0ccc6bbd28df5e14bb7c63d53
uses: slsa-framework/slsa-github-generator/.github/actions/secure-builder-checkout@ae7b9550bb87beb718163df78e66ee8267b803ac
with:
repository: "${{ needs.detect-env.outputs.repository }}"
ref: "${{ needs.detect-env.outputs.ref }}"
Expand Down Expand Up @@ -271,7 +271,7 @@ jobs:
# files and their hashes, so that we can identify the new file without the need to parse
# the manifest.json.
# echo "npm pack --pack-destination="./out"
../"$BUILDER_BINARY" pack \
"$GITHUB_WORKSPACE/$BUILDER_BINARY" pack \
--directory "$UNTRUSTED_DIR"
# cp output into upper folder to make the tarball accessible to
Expand Down Expand Up @@ -302,7 +302,7 @@ jobs:
node-provenance-sha256: ${{ steps.sign-prov.outputs.signed-provenance-sha256 }}
steps:
- name: Checkout builder repository
uses: slsa-framework/slsa-github-generator/.github/actions/secure-builder-checkout@3a3bee691c20c5c0ccc6bbd28df5e14bb7c63d53
uses: slsa-framework/slsa-github-generator/.github/actions/secure-builder-checkout@ae7b9550bb87beb718163df78e66ee8267b803ac
with:
repository: "${{ needs.detect-env.outputs.repository }}"
ref: "${{ needs.detect-env.outputs.ref }}"
Expand Down Expand Up @@ -359,7 +359,7 @@ jobs:
needs: [build, provenance]
steps:
- name: Checkout builder repository
uses: slsa-framework/slsa-github-generator/.github/actions/secure-builder-checkout@3a3bee691c20c5c0ccc6bbd28df5e14bb7c63d53
uses: slsa-framework/slsa-github-generator/.github/actions/secure-builder-checkout@ae7b9550bb87beb718163df78e66ee8267b803ac
with:
repository: "${{ needs.detect-env.outputs.repository }}"
ref: "${{ needs.detect-env.outputs.ref }}"
Expand Down Expand Up @@ -406,6 +406,6 @@ jobs:
set -euo pipefail
# echo "npm publish ${{ inputs.publish-arguments }}"
../"$BUILDER_BINARY" publish \
"$GITHUB_WORKSPACE/$BUILDER_BINARY" publish \
--publish-arguments "$UNTRUSTED_PUBLISH_ARGUMENTS" \
--directory "$UNTRUSTED_DIR"
2 changes: 1 addition & 1 deletion .github/workflows/generator_container_slsa3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
packages: write # Needed to login and upload attestations to ghcr.io.
steps:
- name: Generate builder
uses: slsa-framework/slsa-github-generator/.github/actions/generate-builder@3a3bee691c20c5c0ccc6bbd28df5e14bb7c63d53
uses: slsa-framework/slsa-github-generator/.github/actions/generate-builder@ae7b9550bb87beb718163df78e66ee8267b803ac
with:
repository: "${{ needs.detect-env.outputs.repository }}"
ref: "${{ needs.detect-env.outputs.ref }}"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/generator_generic_slsa3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ jobs:
actions: read # Needed to read workflow info.
steps:
- name: Generate builder
uses: slsa-framework/slsa-github-generator/.github/actions/generate-builder@3a3bee691c20c5c0ccc6bbd28df5e14bb7c63d53
uses: slsa-framework/slsa-github-generator/.github/actions/generate-builder@ae7b9550bb87beb718163df78e66ee8267b803ac
with:
repository: "${{ needs.detect-env.outputs.repository }}"
ref: "${{ needs.detect-env.outputs.ref }}"
Expand Down Expand Up @@ -169,7 +169,7 @@ jobs:
if: startsWith(github.ref, 'refs/tags/') && inputs.upload-assets == true
steps:
- name: Checkout builder repository
uses: slsa-framework/slsa-github-generator/.github/actions/secure-builder-checkout@3a3bee691c20c5c0ccc6bbd28df5e14bb7c63d53
uses: slsa-framework/slsa-github-generator/.github/actions/secure-builder-checkout@ae7b9550bb87beb718163df78e66ee8267b803ac
with:
repository: "${{ needs.detect-env.outputs.repository }}"
ref: "${{ needs.detect-env.outputs.ref }}"
Expand Down

0 comments on commit 0b41106

Please sign in to comment.