diff --git a/.github/workflows/aur.yml b/.github/workflows/aur.yml index f4f68f63f..29ccb2ea7 100644 --- a/.github/workflows/aur.yml +++ b/.github/workflows/aur.yml @@ -19,6 +19,8 @@ jobs: runs-on: ubuntu-latest needs: [get-version] if: github.event_name == 'workflow_dispatch' || needs.get-version.outputs.versionType == 'stable' + env: + INPUT_TAG: ${{ inputs.tag }} outputs: url: ${{ steps.url.outputs.url}} sha256: ${{ steps.sha256.outputs.sha256}} @@ -27,8 +29,8 @@ jobs: id: url run: | URL=""; - if [[ -n "${{ inputs.tag }}" ]]; then - URL="https://github.com/cryptomator/cryptomator/archive/refs/tags/${{ inputs.tag }}.tar.gz" + if [[ -n "${INPUT_TAG}" ]]; then + URL="https://github.com/cryptomator/cryptomator/archive/refs/tags/${INPUT_TAG}.tar.gz" else URL="https://github.com/cryptomator/cryptomator/archive/refs/tags/${{ github.event.release.tag_name }}.tar.gz" fi diff --git a/.github/workflows/av-whitelist.yml b/.github/workflows/av-whitelist.yml index edd5dad30..1feffd719 100644 --- a/.github/workflows/av-whitelist.yml +++ b/.github/workflows/av-whitelist.yml @@ -30,14 +30,16 @@ jobs: runs-on: ubuntu-latest outputs: fileName: ${{ steps.extractName.outputs.fileName}} + env: + INPUT_URL: ${{ inputs.url }} steps: - name: Extract file name id: extractName run: | - url="${{ inputs.url }}" + url="${INPUT_URL}" echo "fileName=${url##*/}" >> $GITHUB_OUTPUT - name: Download file - run: curl --remote-name ${{ inputs.url }} -L -o ${{steps.extractName.outputs.fileName}} + run: curl --remote-name ${INPUT_URL} -L -o ${{steps.extractName.outputs.fileName}} - name: Upload artifact uses: actions/upload-artifact@v4 with: @@ -75,7 +77,7 @@ jobs: with: name: ${{ needs.download-file.outputs.fileName }} path: upload - - name: Upload to Avast + - name: Upload to Avast uses: wlixcc/SFTP-Deploy-Action@v1.2.6 with: server: whitelisting.avast.com diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 6ea0d7442..47f589c89 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -41,13 +41,15 @@ jobs: name: Build Debian Package runs-on: ubuntu-22.04 needs: [get-version] + env: + INPUT_PPAVER: ${inputs.ppaver} steps: - uses: actions/checkout@v5 - id: deb-version name: Determine deb-version run: | - if [ -n "${{inputs.ppaver}}" ]; then - echo "debVersion=${{inputs.ppaver }}" >> "$GITHUB_OUTPUT" + if [ -n "${INPUT_PPAVER}" ]; then + echo "debVersion=${INPUT_PPAVER}" >> "$GITHUB_OUTPUT" else echo "debVersion=${{needs.get-version.outputs.semVerStr}}" >> "$GITHUB_OUTPUT" fi diff --git a/.github/workflows/flathub.yml b/.github/workflows/flathub.yml index 2dbfff0f5..52236cc9b 100644 --- a/.github/workflows/flathub.yml +++ b/.github/workflows/flathub.yml @@ -26,13 +26,10 @@ jobs: - name: Determine tarball url id: url run: | - URL=""; - if [[ -n "${{ inputs.tag }}" ]]; then - URL="https://github.com/cryptomator/cryptomator/archive/refs/tags/${{ inputs.tag }}.tar.gz" - else - URL="https://github.com/cryptomator/cryptomator/archive/refs/tags/${{ github.event.release.tag_name }}.tar.gz" - fi + URL="https://github.com/cryptomator/cryptomator/archive/refs/tags/${TAG}.tar.gz" echo "url=${URL}" >> "$GITHUB_OUTPUT" + env: + TAG: ${{ inputs.tag || github.event.release.tag_name}} - name: Download source tarball and compute checksum id: sha512 run: | diff --git a/.github/workflows/get-version.yml b/.github/workflows/get-version.yml index d24b5692c..a9e8cb33b 100644 --- a/.github/workflows/get-version.yml +++ b/.github/workflows/get-version.yml @@ -49,8 +49,8 @@ jobs: run: | if [[ $GITHUB_REF =~ refs/tags/[0-9]+\.[0-9]+\.[0-9]+.* ]]; then SEM_VER_STR=${GITHUB_REF##*/} - elif [[ "${{ inputs.version }}" =~ [0-9]+\.[0-9]+\.[0-9]+.* ]]; then - SEM_VER_STR="${{ inputs.version }}" + elif [[ "${VERSION_STRING}" =~ [0-9]+\.[0-9]+\.[0-9]+.* ]]; then + SEM_VER_STR="${VERSION_STRING}" else SEM_VER_STR=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout` fi @@ -70,6 +70,8 @@ jobs: echo "semVerNum=${SEM_VER_NUM}" >> $GITHUB_OUTPUT echo "revNum=${REVCOUNT}" >> $GITHUB_OUTPUT echo "type=${TYPE}" >> $GITHUB_OUTPUT + env: + VERSION_STRING: ${{ inputs.version }} - name: Validate Version uses: skymatic/semver-validation-action@v3 with: