From be78c5ae3d717f57e2403098f669c1232f8d4f6e Mon Sep 17 00:00:00 2001 From: Wojtek Mach Date: Fri, 16 Aug 2024 12:14:02 +0200 Subject: [PATCH 1/3] Add otp_win.zip to releases --- .github/workflows/main.yaml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 56d9883f14d6..09ece12d1b6f 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -271,7 +271,7 @@ jobs: distribution: Ubuntu-18.04 - name: Install WSL dependencies - run: apt update && apt install -y g++-mingw-w64 gcc-mingw-w64 make autoconf unzip + run: apt update && apt install -y g++-mingw-w64 gcc-mingw-w64 make autoconf zip unzip - name: Install openssl shell: cmd @@ -355,6 +355,17 @@ jobs: name: otp_win32_installer path: otp/release/win32/otp*.exe + - name: Build zip + run: | + rm -rf otp/release/win32/otp*.exe + (cd otp/release/win32 && zip -r ../../../otp_win.zip .) + + - name: Upload zip + uses: actions/upload-artifact@v4.3.3 + with: + name: otp_win + path: otp_win.zip + build-flavors: name: Build Erlang/OTP (Types and Flavors) runs-on: ubuntu-latest @@ -599,6 +610,7 @@ jobs: uses: actions/download-artifact@v4.1.7 with: name: otp_prebuilt + - name: Download html docs uses: actions/download-artifact@v4.1.7 with: @@ -614,7 +626,7 @@ jobs: run: | shopt -s nullglob cd artifacts - FILES=$(ls {*.tar.gz,*.txt}) + FILES=$(ls {*.tar.gz,*.zip,*.txt}) md5sum $FILES > MD5.txt sha256sum $FILES > SHA256.txt @@ -624,6 +636,7 @@ jobs: name: OTP ${{ steps.tag.outputs.vsn }} files: | artifacts/*.tar.gz + artifacts/*.zip artifacts/*.txt env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 6b1419215a4448567e65e74b87ed710aca3e96c4 Mon Sep 17 00:00:00 2001 From: Wojtek Mach Date: Fri, 16 Aug 2024 12:18:51 +0200 Subject: [PATCH 2/3] Temporary fix for testing --- .github/workflows/main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 09ece12d1b6f..307ec12cfff1 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -587,7 +587,7 @@ jobs: name: Release Erlang/OTP runs-on: ubuntu-latest needs: documentation - if: startsWith(github.ref, 'refs/tags/') && github.repository == 'erlang/otp' + if: startsWith(github.ref, 'refs/tags/') # && github.repository == 'erlang/otp' ## Needed to create releases permissions: contents: write From da2159fb6f84f62ad1f856e10091e1f0346766d2 Mon Sep 17 00:00:00 2001 From: Wojtek Mach Date: Fri, 16 Aug 2024 13:50:49 +0200 Subject: [PATCH 3/3] Revert "Temporary fix for testing" This reverts commit 6b1419215a4448567e65e74b87ed710aca3e96c4. --- .github/workflows/main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 307ec12cfff1..09ece12d1b6f 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -587,7 +587,7 @@ jobs: name: Release Erlang/OTP runs-on: ubuntu-latest needs: documentation - if: startsWith(github.ref, 'refs/tags/') # && github.repository == 'erlang/otp' + if: startsWith(github.ref, 'refs/tags/') && github.repository == 'erlang/otp' ## Needed to create releases permissions: contents: write