diff --git a/.github/workflows/reproducible.yml b/.github/workflows/reproducible.yml index 060a3dd..fa82a0b 100644 --- a/.github/workflows/reproducible.yml +++ b/.github/workflows/reproducible.yml @@ -30,7 +30,7 @@ jobs: - name: Use sample cryptographic material run: rm -R crypto_data/ && cp -r reproducible/sample_crypto_data crypto_data - name: Computing cryptographic hashes - run: ./reproduce_hashes.sh + run: ./maintainers/reproduce_hashes.sh - name: Upload reproduced binaries uses: actions/upload-artifact@v1 diff --git a/maintainers/patches b/maintainers/patches index 89b3e52..4e2c505 100755 --- a/maintainers/patches +++ b/maintainers/patches @@ -17,7 +17,13 @@ help() { Usage: $PROGRAM {apply|save} apply Applies the patches to the Tock submodule. + This resets Tock and can always be called. + save Saves the Tock submodule to the patches. + Should only be called after apply and when all changes have been + added to a commit. After saving, you can run ./setup.sh to return + to normal state. Otherwise you can continue editing Tock and + calling save. EOF exit 0 } diff --git a/maintainers/reproduce_hashes.sh b/maintainers/reproduce_hashes.sh index 6fd97ec..0a75edb 100755 --- a/maintainers/reproduce_hashes.sh +++ b/maintainers/reproduce_hashes.sh @@ -29,7 +29,7 @@ cargo build --manifest-path third_party/tock/tools/sha256sum/Cargo.toml echo "Computing SHA-256 sums of the boards..." for board in nrf52840dk_opensk nrf52840_dongle_opensk nrf52840_dongle_dfu nrf52840_mdk_dfu do - BOARD=$board ./reproduce_board.sh + BOARD=$board ./maintainers/reproduce_board.sh done echo "Computing SHA-256 sum of the TAB file..."