Skip to content

Commit

Permalink
fix(runner): Use current node version if unknown commit
Browse files Browse the repository at this point in the history
  • Loading branch information
mhofman committed Feb 5, 2022
1 parent 1e91303 commit e09adf0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
- uses: actions/checkout@v2
with:
path: "testnet-load-generator"
path: testnet-load-generator

- name: Get the appropriate agoric-sdk branch
id: get-sdk-branch
Expand All @@ -35,11 +35,11 @@ jobs:
console.log(branch);
return branch;
- name: Check out agoric-sdk
- name: Checkout agoric-sdk
uses: actions/checkout@v2
with:
repository: Agoric/agoric-sdk
submodules: "true"
submodules: 'true'
path: agoric-sdk
ref: ${{steps.get-sdk-branch.outputs.result}}

Expand Down
4 changes: 3 additions & 1 deletion start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ export PATH="$AGORIC_BIN_DIR:$PATH"

if [ ! -f "${OUTPUT_DIR}/.nvmrc" ] ; then
SDK_NODE16_REVISION=475d7ff1eb2371aa9e0c0dc7a50644089db351f6
if ! git -C "${SDK_SRC}" merge-base --is-ancestor $SDK_NODE16_REVISION $SDK_FULL_REVISION ; then
if git -C "${SDK_SRC}" cat-file -e $SDK_NODE16_REVISION^{commit} && \
! git -C "${SDK_SRC}" merge-base --is-ancestor $SDK_NODE16_REVISION $SDK_FULL_REVISION
then
echo "lts/fermium" > "${OUTPUT_DIR}/.nvmrc"
fi
if [ -n "$NVM_RC_VERSION" ]; then
Expand Down

0 comments on commit e09adf0

Please sign in to comment.