From 509801e1372826eb7ae8dcf6e00beb16f61600a2 Mon Sep 17 00:00:00 2001 From: Mihail Stoykov Date: Tue, 13 Aug 2024 12:52:31 +0300 Subject: [PATCH 1/3] Fix docker compose in publish-packages --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ef9ba2d5736..fa1d8dcd41b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -351,7 +351,7 @@ jobs: mv "dist/k6-$VERSION-windows-amd64.msi" "dist/k6-$VERSION-amd64.msi" mv "dist/k6-$VERSION-linux-amd64.rpm" "dist/k6-$VERSION-amd64.rpm" mv "dist/k6-$VERSION-linux-amd64.deb" "dist/k6-$VERSION-amd64.deb" - - name: Setup docker-compose environment + - name: Setup docker compose environment run: | cat > packaging/.env < Date: Tue, 13 Aug 2024 13:06:29 +0300 Subject: [PATCH 2/3] try to republish v0.53.0 binaries --- .github/workflows/build.yml | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fa1d8dcd41b..63f53a35d38 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -328,29 +328,17 @@ jobs: publish-packages: runs-on: ubuntu-latest - needs: [configure, build, package-windows] - if: ${{ startsWith(github.ref, 'refs/tags/v') && github.event_name != 'workflow_dispatch' }} env: VERSION: ${{ needs.configure.outputs.k6_version }} steps: - name: Checkout code uses: actions/checkout@v4 - - name: Download binaries - uses: actions/download-artifact@v4 - with: - name: binaries - path: dist - - name: Download Windows binaries - uses: actions/download-artifact@v4 - with: - name: binaries-windows - path: dist - name: Rename binaries # To be consistent with the filenames used in dl.k6.io run: | - mv "dist/k6-$VERSION-windows-amd64.msi" "dist/k6-$VERSION-amd64.msi" - mv "dist/k6-$VERSION-linux-amd64.rpm" "dist/k6-$VERSION-amd64.rpm" - mv "dist/k6-$VERSION-linux-amd64.deb" "dist/k6-$VERSION-amd64.deb" + curl -Lso "dist/k6-v0.53.0-amd64.msi" "https://github.com/grafana/k6/releases/download/v0.53.0/k6-v0.53.0-windows-amd64.msi" + curl -Lso "dist/k6-v0.53.0-amd64.rpm" "https://github.com/grafana/k6/releases/download/v0.53.0/k6-v0.53.0-linux-amd64.rpm" + curl -Lso "dist/k6-v0.53.0-amd64.deb" "https://github.com/grafana/k6/releases/download/v0.53.0/k6-v0.53.0-linux-amd64.deb" - name: Setup docker compose environment run: | cat > packaging/.env < Date: Tue, 13 Aug 2024 13:10:00 +0300 Subject: [PATCH 3/3] mkdir dist --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 63f53a35d38..be5dae2186c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -336,7 +336,8 @@ jobs: - name: Rename binaries # To be consistent with the filenames used in dl.k6.io run: | - curl -Lso "dist/k6-v0.53.0-amd64.msi" "https://github.com/grafana/k6/releases/download/v0.53.0/k6-v0.53.0-windows-amd64.msi" + mkdir dist + curl -Lso "dist/k6-v0.53.0-amd64.msi" "https://github.com/grafana/k6/releases/download/v0.53.0/k6-v0.53.0-windows-amd64.msi" curl -Lso "dist/k6-v0.53.0-amd64.rpm" "https://github.com/grafana/k6/releases/download/v0.53.0/k6-v0.53.0-linux-amd64.rpm" curl -Lso "dist/k6-v0.53.0-amd64.deb" "https://github.com/grafana/k6/releases/download/v0.53.0/k6-v0.53.0-linux-amd64.deb" - name: Setup docker compose environment