From 2adbd9700dcd2b89e60823cc99adde7f37ff5e43 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 25 Feb 2023 02:07:56 +0000 Subject: [PATCH 1/7] chore(deps): update actions/cache action to v3 --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e37fbbf..29485a5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -90,7 +90,7 @@ jobs: # Optimization: re-use cached Nim->C compilation - name: Restore cache if: matrix.nim-version != 'ref:HEAD' && matrix.nim-version != 'latest' - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.cache key: cache-${{ matrix.os }}-${{ matrix.nim-version }} @@ -125,7 +125,7 @@ jobs: steps: # Optimization: re-use cached Nim->C compilation - name: Restore cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.cache key: cache-ubuntu-latest-${{ matrix.nim-version }} @@ -161,7 +161,7 @@ jobs: steps: # Optimization: re-use cached Nim->C compilation - name: Restore cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.cache key: cache-${{ matrix.arch }}-${{ matrix.nim-version }} From de5e3926b010b19bd4780c5b76c68a25dd4be6aa Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 25 Feb 2023 02:14:51 +0000 Subject: [PATCH 2/7] chore(deps): update bats-assert digest to 44913ff --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index de720cf..5ef045a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "devDependencies": { "bats": "^1.8.2", - "bats-assert": "git+https://github.com/bats-core/bats-assert.git#78fa631", + "bats-assert": "git+https://github.com/bats-core/bats-assert.git#44913ff", "bats-support": "^0.3.0", "lintball": "^1.6.0" }, From db671b5204c53260b80db80d72ad847aa27ad9dd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 25 Feb 2023 02:19:30 +0000 Subject: [PATCH 3/7] chore(deps): update actions/checkout action to v3 --- .github/workflows/build.yml | 6 +++--- .github/workflows/lint.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 29485a5..fc02f3e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,7 +36,7 @@ jobs: steps: - name: Checkout plugin - uses: actions/checkout@v2 + uses: actions/checkout@v3 - uses: actions/setup-node@v2 with: @@ -103,7 +103,7 @@ jobs: uses: asdf-vm/actions/setup@v1 - name: Checkout plugin - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Install asdf-nim & test shell: bash @@ -167,7 +167,7 @@ jobs: key: cache-${{ matrix.arch }}-${{ matrix.nim-version }} - name: Checkout plugin - uses: actions/checkout@v2 + uses: actions/checkout@v3 # Install & run tests on non-x86 - uses: uraimo/run-on-arch-action@v2 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 8371daa..ecffdf5 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 From 7b2ca4effde95a066eef38e9e0356ca627747476 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 25 Feb 2023 02:19:36 +0000 Subject: [PATCH 4/7] chore(deps): update actions/setup-node action to v3 --- .github/workflows/build.yml | 2 +- .github/workflows/lint.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 29485a5..5f507a1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,7 +38,7 @@ jobs: - name: Checkout plugin uses: actions/checkout@v2 - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: '15' diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 8371daa..6d8c748 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -19,7 +19,7 @@ jobs: with: fetch-depth: 0 - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: '15' From b638c6badd9c3515fff7d444f3ca43f6ab18cf91 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 25 Feb 2023 02:19:42 +0000 Subject: [PATCH 5/7] chore(deps): update actions/setup-python action to v4 --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 8371daa..4073edb 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -23,7 +23,7 @@ jobs: with: node-version: '15' - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v4 with: python-version: '3.x' From 4f673dd3f32bf715497d9cc528a38d5c98e75bdc Mon Sep 17 00:00:00 2001 From: Elijah Shaw-Rutschman Date: Fri, 24 Feb 2023 20:28:06 -0600 Subject: [PATCH 6/7] Linting --- bin/exec-env | 4 ++-- lib/utils.bash | 16 ++++++++-------- shims/nimble | 2 +- test/lib/test_utils.bash | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bin/exec-env b/bin/exec-env index fc61252..e78b5c4 100755 --- a/bin/exec-env +++ b/bin/exec-env @@ -11,7 +11,7 @@ if [ "${ASDF_NIM_MACOS_M1_HOMEBREW_WORKAROUND:-yes}" = "yes" ] && [ "$(uname)" = "Darwin" ] && [ "$(uname -m)" = "arm64" ] && - [ "${DYLD_LIBRARY_PATH:-}" = "" ] && + [ "${DYLD_LIBRARY_PATH-}" = "" ] && [ -d /opt/homebrew/lib ]; then export DYLD_LIBRARY_PATH DYLD_LIBRARY_PATH=/opt/homebrew/lib @@ -28,7 +28,7 @@ export NIMBLE_DIR # Otherwise if the current working directory has a nimbledeps directory, use that. # Otherwise, use the nimble directory within ASDF_INSTALL_PATH. # see https://github.com/nim-lang/nimble#nimbles-folder-structure-and-packages -if [ "${NIMBLE_DIR:-}" = "" ] && +if [ "${NIMBLE_DIR-}" = "" ] && [ ! -d "${PWD}/nimbledeps" ]; then NIMBLE_DIR="${ASDF_INSTALL_PATH}/nimble" fi diff --git a/lib/utils.bash b/lib/utils.bash index 8acf8de..bb2b380 100644 --- a/lib/utils.bash +++ b/lib/utils.bash @@ -47,7 +47,7 @@ asdf_nim_init() { # End configuration options # Ensure ASDF_DATA_DIR has a value - if [ -n "${ASDF_INSTALL_PATH:-}" ]; then + if [ -n "${ASDF_INSTALL_PATH-}" ]; then export ASDF_DATA_DIR ASDF_DATA_DIR="${ASDF_DATA_DIR:-$HOME/.asdf}" export ASDF_NIM_TEMP @@ -94,7 +94,7 @@ asdf_nim_on_exit() { asdf_nim_cleanup_asdf_download_path() { if [ -d "$ASDF_DOWNLOAD_PATH" ]; then - if [ "${1:-}" = "force" ]; then + if [ "${1-}" = "force" ]; then # Force delete step_start "rm ${ASDF_DOWNLOAD_PATH//${HOME}/\~}" rm -rf "$ASDF_DOWNLOAD_PATH" @@ -131,7 +131,7 @@ asdf_nim_on_exit() { # any cleanup here... *unless* ASDF_NIM_SIGNAL is set, in which case # install will not be called and ASDF_DOWNLOAD_PATH should be deleted # regardless of --keep-download/always_keep_download. - case "${ASDF_NIM_SIGNAL:-}" in + case "${ASDF_NIM_SIGNAL-}" in SIG*) # cleanup everything asdf_nim_cleanup_asdf_install_path @@ -247,7 +247,7 @@ asdf_nim_normalize_arch() { arch="${ASDF_NIM_MOCK_MACHINE_NAME:-$(uname -m)}" case "$arch" in x86_64 | x64 | amd64) - if [ -n "$(command -v gcc)" ] || [ -n "${ASDF_NIM_MOCK_GCC_DEFINES:-}" ]; then + if [ -n "$(command -v gcc)" ] || [ -n "${ASDF_NIM_MOCK_GCC_DEFINES-}" ]; then # Edge case: detect 386 container on amd64 kernel using __amd64 definition IS_AMD64="$(echo "${ASDF_NIM_MOCK_GCC_DEFINES:-$(gcc -dM -E - Date: Sat, 14 Sep 2024 08:44:09 +0900 Subject: [PATCH 7/7] Update .github/CODEOWNERS