diff --git a/.gitea/workflows/.varnish-exporter.yml.swp b/.gitea/workflows/.varnish-exporter.yml.swp deleted file mode 100644 index dbe1196..0000000 Binary files a/.gitea/workflows/.varnish-exporter.yml.swp and /dev/null differ diff --git a/.gitea/workflows/varnish-exporter.yml b/.gitea/workflows/varnish-exporter.yml index 5b68066..ee5f6ce 100644 --- a/.gitea/workflows/varnish-exporter.yml +++ b/.gitea/workflows/varnish-exporter.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest outputs: build: ${{ steps.new_version.outputs.build }} - tag: ${{ steps.new_version.outputs.tag }} + version: ${{ steps.new_version.outputs.tag }} steps: - uses: actions/checkout@v4 @@ -26,7 +26,7 @@ jobs: if awk "BEGIN {exit !($LATEST > $CURRENT)}"; then echo $LATEST > .version echo "build=true" >> $GITHUB_OUTPUT - echo "tag=$LATEST" >> $GITHUB_OUTPUT + echo "version=$LATEST" >> $GITHUB_OUTPUT else echo "build=false" >> $GITHUB_OUTPUT fi @@ -45,8 +45,8 @@ jobs: - name: DEBUG - build value run: echo "${{ steps.new_version.outputs.build }}" - - name: DEBUG - tag value - run: echo "${{ steps.new_version.outputs.tag }}" + - name: DEBUG - version value + run: echo "${{ steps.new_version.outputs.version }}" build: needs: validate @@ -55,12 +55,12 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - with: - ref: '${{ needs.validate.outputs.tag }}' - name: Set version to env vars run: | echo "VERSION=`cat .version`" >> $GITHUB_ENV + echo "version: $VERSION" + echo "${{ needs.validate.outputs.version }}" - name: Setup go uses: actions/setup-go@v4 @@ -85,7 +85,6 @@ jobs: - name: Prepare amd64 control file run: | - #VERSION=`cat .version` echo "Package: varnish-exporter" > varnish-exporter-amd64/DEBIAN/control echo "Version: $VERSION" >> varnish-exporter-amd64/DEBIAN/control echo "Maintainer: Ludovic Cartier " >> varnish-exporter-amd64/DEBIAN/control @@ -108,15 +107,8 @@ jobs: - name: Create release uses: akkuman/gitea-release-action@v1 -i with: - tag_name: '${{ needs.validate.outputs.tag }}' + with: + tag_name: "${{ needs.validate.outputs.version }}" files: |- bin/** token: "${{ secrets.RELEASE_TOKEN }}" -# uses: https://gitea.com/actions/release-action@main -# with: -# draft: false -# prerelease: false -# files: |- -# bin/** - diff --git a/.version b/.version index 9c6d629..524cb55 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.6.1 +1.1.1