Commit 69969db8 authored by Ruben ten Hove's avatar Ruben ten Hove
Browse files

fix: upgrade dasel to v2

parent b4e86341

project-automation/gitlab/recommended.yml

+6 −6
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ include: 
gitlab:recommended:

  stage: test

  image:

    name: ghcr.io/tomwright/dasel:v1.27.3-alpine

    name: ghcr.io/tomwright/dasel:alpine

    entrypoint: [""]

  variables:

    GIT_STRATEGY: none
@@ -22,14 +22,14 @@ gitlab:recommended: 
    - FILE=project_${CI_PROJECT_ID}_details

    - |

      curl -sSLf -H "PRIVATE-TOKEN: ${GL_TOKEN}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}" -o ${FILE}.json

    - dasel -f ${FILE}.json -r json -w yaml > ${FILE}.yml

    - dasel -f "${FILE}.json" -r json --write yaml > ${FILE}.yml

    - let COUNT=0 || true

    - |

      for KEY in $(dasel -f .settings.yml -m '.-'); do

      for KEY in $(dasel -f .settings.yml --transform '.'); do

        printf "[*] Checking ${KEY}..."

        CURRENT=$(dasel -f ${FILE}.yml ${KEY})

        RECOMMENDED=$(dasel -f .settings.yml "${KEY}".recommended)

        HINT=$(dasel -f .settings.yml ${KEY}.hint)

        CURRENT=$(dasel -f "${FILE}.yml" get "${KEY}")

        RECOMMENDED=$(dasel -f .settings.yml get "${KEY}.recommended")

        HINT=$(dasel -f .settings.yml get "${KEY}.hint")

        if [ "${CURRENT}" != "${RECOMMENDED}" ]; then

          echo -e " \e[31mrecommended value not set\e[0m. Current value is: ${CURRENT}. Expected value is: ${RECOMMENDED}."

          echo "${HINT}"

project-automation/semantic-release.yml

+5 −5
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ include: 


semantic-release:

  extends: .release:rules

  image: registry.gitlab.com/just-ci/images/node:latest

  image: registry.gitlab.com/just-ci/images/node:alpine

  stage: .post

  variables:

    NPM_PACKAGES:
@@ -22,7 +22,7 @@ semantic-release: 
      fi



    - |

      if [ "$(dasel -f .releaserc -r json -m '(?:-=assets)')" = "[]" ] && [ "${DISABLE_AUTO_RELEASE_ASSETS}" = "" ]; then

      if [ "$(dasel -f .releaserc -r json -m '.[] | select(. | test("-=assets"))')" = "[]" ] && [ "${DISABLE_AUTO_RELEASE_ASSETS}" = "" ]; then

        echo "[-] No assets set in .releaserc."

        if test -f tbump.toml; then

          SOURCE_FILE=tbump.toml
@@ -38,7 +38,7 @@ semantic-release: 
    - |

      if [ "${SOURCE_FILE}" != "" ]; then

        dasel --version

        TBUMP_FILES=$(dasel -n -f ${SOURCE_FILE} -r toml -w yaml -m "${DASEL_PATH}.[*].src")

        TBUMP_FILES=$(dasel -n -f "${SOURCE_FILE}" -r toml --write yaml --transform "${DASEL_PATH}.[*].src")

        if [ "${TBUMP_FILES}" = "null" ]; then

          echo "[-] No files set. Not pushing assets."

        else
@@ -46,8 +46,8 @@ semantic-release: 
            TBUMP_FILES="${TBUMP_FILES} CHANGELOG.md"

          fi

          for FILE in ${TBUMP_FILES} ${SOURCE_FILE}; do

            if [ "$(dasel -n -f .releaserc -p json -m '(?:-=assets).(?:.=${FILE})')" = "null" ]; then

              dasel put string -f .releaserc -p json -m '(?:-=assets).[]' "${FILE}"

            if [ "$(dasel -n -f .releaserc -r json --transform '.[] | select(. | test("-=assets") and . == env.FILE)')" = "null" ]; then

              dasel put string -f .releaserc -r json --transform '.[] |= . + env.FILE'

              echo "[+] Added ${FILE} to .releaserc."

            fi

          done