chore: update dasel and jq

Author: ivan-aksamentov

.github/workflows/cli.yml

@@ -145,13 +145,13 @@ jobs:
       - name: "Install deps"
         run: |
           mkdir -p "${HOME}/bin"
-          curl -fsSL "https://github.com/TomWright/dasel/releases/download/v1.24.3/dasel_linux_amd64" -o "${HOME}/bin/dasel" && chmod +x "${HOME}/bin/dasel"
+          curl -fsSL "https://github.com/TomWright/dasel/releases/download/v2.5.0/dasel_linux_amd64" -o "${HOME}/bin/dasel" && chmod +x "${HOME}/bin/dasel"
 
       - name: "Prepare .env file"
         run: |
           export PATH="${PATH}:${HOME}/bin"
 
-          version=$(dasel select -p toml -s ".workspace.package.version" -f "Cargo.toml")
+          version=$(dasel select -r toml -w - -s ".workspace.package.version" -f "Cargo.toml")
           if [[ "$version" =~ (rc|beta|alpha) ]]; then
               export DATA_FULL_DOMAIN="https://data.master.clades.nextstrain.org/v3"
           fi
@@ -300,7 +300,7 @@ jobs:
         run: |
           mkdir -p "${HOME}/bin"
           export PATH="${HOME}/bin:${PATH}"
-          curl -fsSL "https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64" -o ${HOME}/bin/jq && chmod +x ${HOME}/bin/jq
+          curl -fsSL "https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-amd64" -o ${HOME}/bin/jq && chmod +x ${HOME}/bin/jq
 
       - name: "Download build artifacts"
         uses: actions/download-artifact@v4
@@ -418,9 +418,9 @@ jobs:
         run: |
           mkdir -p "${HOME}/bin"
           curl -fsSL "https://github.com/cli/cli/releases/download/v2.10.1/gh_2.10.1_linux_amd64.tar.gz" | tar xz -C "${HOME}/bin" --strip-components=2 gh_2.10.1_linux_amd64/bin/gh
-          curl -fsSL "https://github.com/TomWright/dasel/releases/download/v1.24.3/dasel_linux_amd64" -o "${HOME}/bin/dasel" && chmod +x "${HOME}/bin/dasel"
+          curl -fsSL "https://github.com/TomWright/dasel/releases/download/v2.5.0/dasel_linux_amd64" -o "${HOME}/bin/dasel" && chmod +x "${HOME}/bin/dasel"
           curl -fsSL "https://github.com/orhun/git-cliff/releases/download/v0.7.0/git-cliff-0.7.0-x86_64-unknown-linux-gnu.tar.gz" | tar -C "${HOME}/bin" --strip-components=1 -xz "git-cliff-0.7.0/git-cliff"
-          curl -fsSL "https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64" -o ${HOME}/bin/jq && chmod +x ${HOME}/bin/jq
+          curl -fsSL "https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-amd64" -o ${HOME}/bin/jq && chmod +x ${HOME}/bin/jq
 
       - name: "Publish build artifacts to GitHub releases"
         run: |
@@ -454,7 +454,7 @@ jobs:
       - name: "Install deploy dependencies"
         run: |
           mkdir -p "${HOME}/bin"
-          curl -fsSL "https://github.com/TomWright/dasel/releases/download/v1.24.3/dasel_linux_amd64" -o "${HOME}/bin/dasel" && chmod +x "${HOME}/bin/dasel"
+          curl -fsSL "https://github.com/TomWright/dasel/releases/download/v2.5.0/dasel_linux_amd64" -o "${HOME}/bin/dasel" && chmod +x "${HOME}/bin/dasel"
 
       - name: "Login to Docker Hub"
         uses: docker/login-action@v3

docker/docker-dev.dockerfile

@@ -167,7 +167,7 @@ RUN set -euxo pipefail >/dev/null \
 
 # Install jq, a tool to query JSON files
 RUN set -euxo pipefail >/dev/null \
-&& curl -fsSL -o "/usr/bin/jq" "https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64" \
+&& curl -fsSL -o "/usr/bin/jq" "https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-amd64" \
 && chmod +x "/usr/bin/jq" \
 && jq --version
 
@@ -207,7 +207,7 @@ USER ${UID}
 COPY rust-toolchain.toml "${HOME}/rust-toolchain.toml"
 RUN set -euxo pipefail >/dev/null \
 && cd "${HOME}" \
-&& RUST_TOOLCHAIN=$(dasel select -p toml -s ".toolchain.channel" -f "${HOME}/rust-toolchain.toml") \
+&& RUST_TOOLCHAIN=$(dasel select -r toml -w - -s ".toolchain.channel" -f "${HOME}/rust-toolchain.toml") \
 && curl --proto '=https' -sSf https://sh.rustup.rs > rustup-init \
 && chmod +x rustup-init \
 && ./rustup-init -y --no-modify-path --default-toolchain="${RUST_TOOLCHAIN}" \
@@ -216,14 +216,14 @@ RUN set -euxo pipefail >/dev/null \
 # Install toolchain from rust-toolchain.toml and make it default
 RUN set -euxo pipefail >/dev/null \
 && cd "${HOME}" \
-&& RUST_TOOLCHAIN=$(dasel select -p toml -s ".toolchain.channel" -f "rust-toolchain.toml") \
+&& RUST_TOOLCHAIN=$(dasel select -r toml -w - -s ".toolchain.channel" -f "rust-toolchain.toml") \
 && rustup toolchain install "${RUST_TOOLCHAIN}" \
 && rustup default "${RUST_TOOLCHAIN}"
 
 # Install remaining toolchain components from rust-toolchain.toml
 RUN set -euxo pipefail >/dev/null \
 && cd "${HOME}" \
-&& RUST_TOOLCHAIN=$(dasel select -p toml -s ".toolchain.channel" -f "rust-toolchain.toml") \
+&& RUST_TOOLCHAIN=$(dasel select -r toml -w - -s ".toolchain.channel" -f "rust-toolchain.toml") \
 && rustup show \
 && rustup default "${RUST_TOOLCHAIN}"
 

scripts/build_on_vercel.sh

@@ -73,7 +73,7 @@ if ! command cargo &>/dev/null; then
   curl -fsSL "https://github.com/TomWright/dasel/releases/download/v${DASEL_VERSION}/dasel_linux_amd64" -o "/usr/bin/dasel"
   chmod +x "/usr/bin/dasel"
 
-  RUST_TOOLCHAIN=$(dasel select -p toml -s ".toolchain.channel" -f "rust-toolchain.toml")
+  RUST_TOOLCHAIN=$(dasel select -r toml -w - -s ".toolchain.channel" -f "rust-toolchain.toml")
   curl -sSf https://sh.rustup.rs >rustup-init
   chmod +x rustup-init
   ./rustup-init -y --no-modify-path --default-toolchain="${RUST_TOOLCHAIN}"

scripts/cli_get_data_full_domain.sh

@@ -16,7 +16,7 @@ THIS_DIR="$(
 
 : "${1:?Branch name is required as the first argument.}"
 
-version=$(dasel select -p toml -s ".workspace.package.version" -f "Cargo.toml")
+version=$(dasel select -r toml -w - -s ".workspace.package.version" -f "Cargo.toml")
 prerel=$("${THIS_DIR}/semver" get prerel "${version}" | cut -d '.' -f 1)
 branch="${1}"
 

scripts/publish_docker

@@ -8,7 +8,7 @@
 #  - dasel
 #     mkdir -p "${HOME}/bin"
 #     export PATH="${HOME}/bin:${PATH}"
-#     curl -fsSL "https://github.com/TomWright/dasel/releases/download/v1.24.3/dasel_linux_amd64" -o "${HOME}/bin/dasel" && chmod +x "${HOME}/bin/dasel"
+#     curl -fsSL "https://github.com/TomWright/dasel/releases/download/v2.5.0/dasel_linux_amd64" -o "${HOME}/bin/dasel" && chmod +x "${HOME}/bin/dasel"
 
 set -euo pipefail
 trap "exit" INT
@@ -41,7 +41,7 @@ declare -a BASE_IMAGES=(
   "debian"
 )
 
-version=$(dasel select -p toml -s ".workspace.package.version" -f "Cargo.toml")
+version=$(dasel select -r toml -w - -s ".workspace.package.version" -f "Cargo.toml")
 version_major=$("${THIS_DIR}/semver" get major "${version}")
 release_type=$("${THIS_DIR}/semver" get prerel "${version}" | cut -d '.' -f 1)
 release_type=${release_type:=latest}

scripts/publish_github

@@ -7,8 +7,8 @@
 #  mkdir -p "${HOME}/bin"
 #  export PATH="${HOME}/bin:${PATH}"
 #  curl -fsSL "https://github.com/cli/cli/releases/download/v2.10.1/gh_2.10.1_linux_amd64.tar.gz" | tar xz -C "${HOME}/bin" --strip-components=2 gh_2.10.1_linux_amd64/bin/gh
-#  curl -fsSL "https://github.com/TomWright/dasel/releases/download/v1.24.3/dasel_linux_amd64" -o "${HOME}/bin/dasel" && chmod +x "${HOME}/bin/dasel"
-#  curl -fsSL "https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64" -o ${HOME}/bin/jq && chmod +x ${HOME}/bin/jq
+#  curl -fsSL "https://github.com/TomWright/dasel/releases/download/v2.5.0/dasel_linux_amd64" -o "${HOME}/bin/dasel" && chmod +x "${HOME}/bin/dasel"
+#  curl -fsSL "https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-amd64" -o ${HOME}/bin/jq && chmod +x ${HOME}/bin/jq
 
 set -euo pipefail
 trap "exit" INT
@@ -56,7 +56,7 @@ done
 [ -z "$repo" ] && echo "--repo is required" >/dev/stderr && exit 1
 [ -z "$git_sha" ] && echo "--git_sha is required" >/dev/stderr && exit 1
 
-version=$(dasel select -p toml -s ".workspace.package.version" -f "Cargo.toml")
+version=$(dasel select -r toml -w - -s ".workspace.package.version" -f "Cargo.toml")
 release_type=$("${THIS_DIR}/semver" get prerel "${version}" | cut -d '.' -f 1)
 prerelease_flag=${release_type:+--prerelease}