diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index a6936dba..d91bc7fe 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -43,13 +43,13 @@ jobs: echo "/usr/local/bin" >> $GITHUB_PATH echo "$(brew --prefix)/opt/gnu-sed/libexec/gnubin" >> $GITHUB_PATH - name: Install more - run: ./bin/dfx-releases-more-install + run: ./bin/dfx-software-more-install - name: Install dfx - run: ./bin/dfx-releases-dfx-install + run: ./bin/dfx-software-dfx-install - name: Install quill - run: ./bin/dfx-releases-quill-install + run: ./bin/dfx-software-quill-install - name: Install idl2json - run: ./bin/dfx-releases-idl2json-install + run: ./bin/dfx-software-idl2json-install - name: Run the demo with the current default ic commits run: bin/demo-cli # demo_latest: @@ -64,9 +64,9 @@ jobs: # - name: Checkout # uses: actions/checkout@v3 # - name: Install dfx -# run: ./bin/dfx-releases-dfx-install +# run: ./bin/dfx-software-dfx-install # - name: Install quill -# run: ./bin/dfx-releases-quill-install +# run: ./bin/dfx-software-quill-install # - name: Checkout ic repo # uses: actions/checkout@v3 # with: diff --git a/bin/demo-cli b/bin/demo-cli index 0ce910cd..1543b79e 100755 --- a/bin/demo-cli +++ b/bin/demo-cli @@ -19,10 +19,10 @@ cd "$(dirname "$(realpath "$0")")/.." demo-cleanup # If ic-commit is specified, get execuables from there: -[[ "${IC_COMMIT:-}" != "latest" ]] || IC_COMMIT="$(dfx-releases ic latest)" -[[ "${IC_COMMIT:-}" != "" ]] || IC_COMMIT="$(dfx-releases ic current)" +[[ "${IC_COMMIT:-}" != "latest" ]] || IC_COMMIT="$(dfx-software ic latest)" +[[ "${IC_COMMIT:-}" != "" ]] || IC_COMMIT="$(dfx-software ic current)" rm -fr "$DEMO_BIN" -dfx-releases ic install-executable --commit "$IC_COMMIT" --bin "$DEMO_BIN" ic-admin sns +dfx-software ic install-executable --commit "$IC_COMMIT" --bin "$DEMO_BIN" ic-admin sns echo "Using binaries from ic commit: $IC_COMMIT" ./bin/demo-system-subnet diff --git a/bin/dfx-releases b/bin/dfx-software similarity index 100% rename from bin/dfx-releases rename to bin/dfx-software diff --git a/bin/dfx-releases-dfx b/bin/dfx-software-dfx similarity index 100% rename from bin/dfx-releases-dfx rename to bin/dfx-software-dfx diff --git a/bin/dfx-releases-dfx-install b/bin/dfx-software-dfx-install similarity index 100% rename from bin/dfx-releases-dfx-install rename to bin/dfx-software-dfx-install diff --git a/bin/dfx-releases-ic b/bin/dfx-software-ic similarity index 100% rename from bin/dfx-releases-ic rename to bin/dfx-software-ic diff --git a/bin/dfx-releases-ic-current b/bin/dfx-software-ic-current similarity index 100% rename from bin/dfx-releases-ic-current rename to bin/dfx-software-ic-current diff --git a/bin/dfx-releases-ic-install-executable b/bin/dfx-software-ic-install-executable similarity index 97% rename from bin/dfx-releases-ic-install-executable rename to bin/dfx-software-ic-install-executable index 18a03d87..6f49f439 100755 --- a/bin/dfx-releases-ic-install-executable +++ b/bin/dfx-software-ic-install-executable @@ -29,7 +29,7 @@ mkdir -p "$USER_BIN" [[ "${IC_COMMIT}" != "latest" ]] || { echo "Finding the latest commit..." - IC_COMMIT="$(dfx-releases ic latest)" + IC_COMMIT="$(dfx-software ic latest)" } echo "Installing $*" diff --git a/bin/dfx-releases-ic-latest b/bin/dfx-software-ic-latest similarity index 100% rename from bin/dfx-releases-ic-latest rename to bin/dfx-software-ic-latest diff --git a/bin/dfx-releases-idl2json b/bin/dfx-software-idl2json similarity index 100% rename from bin/dfx-releases-idl2json rename to bin/dfx-software-idl2json diff --git a/bin/dfx-releases-idl2json-install b/bin/dfx-software-idl2json-install similarity index 98% rename from bin/dfx-releases-idl2json-install rename to bin/dfx-software-idl2json-install index 17756449..00eeb374 100755 --- a/bin/dfx-releases-idl2json-install +++ b/bin/dfx-software-idl2json-install @@ -12,7 +12,7 @@ optparse.define short=b long=bin desc="Local directory for executables" variable source "$(optparse.build)" set -euo pipefail -[[ "${IDL2JSON_VERSION:-}" != "latest" ]] || IDL2JSON_VERSION="$(dfx-releases-idl2json-latest)" +[[ "${IDL2JSON_VERSION:-}" != "latest" ]] || IDL2JSON_VERSION="$(dfx-software-idl2json-latest)" mkdir -p "$USER_BIN" diff --git a/bin/dfx-releases-idl2json-latest b/bin/dfx-software-idl2json-latest similarity index 100% rename from bin/dfx-releases-idl2json-latest rename to bin/dfx-software-idl2json-latest diff --git a/bin/dfx-releases-more b/bin/dfx-software-more similarity index 100% rename from bin/dfx-releases-more rename to bin/dfx-software-more diff --git a/bin/dfx-releases-more-install b/bin/dfx-software-more-install similarity index 100% rename from bin/dfx-releases-more-install rename to bin/dfx-software-more-install diff --git a/bin/dfx-releases-nns-dapp b/bin/dfx-software-nns-dapp similarity index 100% rename from bin/dfx-releases-nns-dapp rename to bin/dfx-software-nns-dapp diff --git a/bin/dfx-releases-nns-dapp-latest b/bin/dfx-software-nns-dapp-latest similarity index 100% rename from bin/dfx-releases-nns-dapp-latest rename to bin/dfx-software-nns-dapp-latest diff --git a/bin/dfx-releases-quill b/bin/dfx-software-quill similarity index 100% rename from bin/dfx-releases-quill rename to bin/dfx-software-quill diff --git a/bin/dfx-releases-quill-install b/bin/dfx-software-quill-install similarity index 94% rename from bin/dfx-releases-quill-install rename to bin/dfx-software-quill-install index ae5b3779..86688fb7 100755 --- a/bin/dfx-releases-quill-install +++ b/bin/dfx-software-quill-install @@ -12,7 +12,7 @@ optparse.define short=b long=bin desc="Local directory for executables" variable source "$(optparse.build)" set -euo pipefail -[[ "${QUILL_VERSION:-}" != "latest" ]] || QUILL_VERSION="$(dfx-releases-quill-latest)" +[[ "${QUILL_VERSION:-}" != "latest" ]] || QUILL_VERSION="$(dfx-software-quill-latest)" QUILL_VERSION="${QUILL_VERSION#v}" # change v1.2.3 to 1.2.3 to match download URLs mkdir -p "$USER_BIN" diff --git a/bin/dfx-releases-quill-latest b/bin/dfx-software-quill-latest similarity index 100% rename from bin/dfx-releases-quill-latest rename to bin/dfx-software-quill-latest diff --git a/bin/dfx-releases-sns-quill b/bin/dfx-software-sns-quill similarity index 100% rename from bin/dfx-releases-sns-quill rename to bin/dfx-software-sns-quill diff --git a/bin/dfx-releases-sns-quill-install b/bin/dfx-software-sns-quill-install similarity index 94% rename from bin/dfx-releases-sns-quill-install rename to bin/dfx-software-sns-quill-install index 91514daf..076e8271 100755 --- a/bin/dfx-releases-sns-quill-install +++ b/bin/dfx-software-sns-quill-install @@ -12,7 +12,7 @@ optparse.define short=b long=bin desc="Local directory for executables" variable source "$(optparse.build)" set -euo pipefail -[[ "${QUILL_VERSION:-}" != "latest" ]] || QUILL_VERSION="$(dfx-releases-sns-quill-latest)" +[[ "${QUILL_VERSION:-}" != "latest" ]] || QUILL_VERSION="$(dfx-software-sns-quill-latest)" mkdir -p "$USER_BIN" diff --git a/bin/dfx-releases-sns-quill-latest b/bin/dfx-software-sns-quill-latest similarity index 100% rename from bin/dfx-releases-sns-quill-latest rename to bin/dfx-software-sns-quill-latest