From 119e77645d883145667f65efef002e76b65a14f7 Mon Sep 17 00:00:00 2001 From: Ben Wesch Date: Tue, 27 Aug 2024 10:11:25 +0200 Subject: [PATCH] minor workflow simplifications --- .github/workflows/makefile.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index c5c4c83..1e198dd 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -97,7 +97,7 @@ jobs: # Big thanks to @tomara-x and @timothyschoen for showing me how to do this! -ag github-release: - if: startsWith(github.ref, 'refs/tags/') + if: github.ref_type == 'tag' runs-on: ubuntu-latest needs: [ubuntu-build, macos-build, windows-build] @@ -157,13 +157,11 @@ jobs: - name: check deken package shell: bash run: | - SHORT=${GITHUB_REF:10} - VERSION=${SHORT//\//_} echo "## ${{ matrix.os }}" | tee -a $GITHUB_STEP_SUMMARY mkdir -p package-${{ matrix.os }} docker run --rm --user $(id -u) --volume ./pdlua-${{ matrix.os }}:/pdlua \ --volume ./package-${{ matrix.os }}:/package registry.git.iem.at/pd/deken \ - deken package --output-dir /package -v "${VERSION}" /pdlua + deken package --output-dir /package -v "${{ github.ref_name }}" /pdlua dek_files=$(ls package-${{ matrix.os }}/*.dek) for dek_file in $dek_files; do @@ -204,13 +202,11 @@ jobs: DEKEN_USERNAME: ${{ secrets.DEKEN_USERNAME }} DEKEN_PASSWORD: ${{ secrets.DEKEN_PASSWORD }} run: | - SHORT=${GITHUB_REF:10} - VERSION=${SHORT//\//_} for os in ubuntu macos windows; do docker run --rm -e DEKEN_USERNAME -e DEKEN_PASSWORD \ --volume ./pdlua-${os}:/pdlua registry.git.iem.at/pd/deken \ - deken upload --no-source-error -v "${VERSION}" /pdlua + deken upload --no-source-error -v "${{ github.ref_name }}" /pdlua done docker run --rm -e DEKEN_USERNAME -e DEKEN_PASSWORD \ --volume ./pdlua-src:/pdlua registry.git.iem.at/pd/deken \ - deken upload -v "${VERSION}" /pdlua + deken upload -v "${{ github.ref_name }}" /pdlua