From a602ba2609a06bebc49d8c6c8b4f80e4e851099d Mon Sep 17 00:00:00 2001
From: Erik Martin-Dorel <erik.martin-dorel@irit.fr>
Date: Sun, 6 Mar 2022 19:59:14 +0100
Subject: [PATCH] =?UTF-8?q?fix:=20Change=20`learn-ocaml-www.zip`=20inner?=
 =?UTF-8?q?=20dir=20(`www`=20=E2=86=92=20`learn-ocaml-www`)=20(#474)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Motivation: avoid a conflict between "source www" and "generated www",
doing `unzip learn-ocaml-www.zip; learn-ocaml build --contents-dir=…`.

Related: e36d874551f453231142fdabf8971ea708437687
---
 .github/workflows/static-builds.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/static-builds.yml b/.github/workflows/static-builds.yml
index da30f4088..af744be40 100644
--- a/.github/workflows/static-builds.yml
+++ b/.github/workflows/static-builds.yml
@@ -18,23 +18,23 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        archive: ["learn-ocaml-www.zip"]
+        arch_dir: ["learn-ocaml-www"]
         # we could use an env var, albeit it would be less convenient
     steps:
       - name: Check out the repo
         uses: actions/checkout@v2
       - name: Build learn-ocaml-compilation
         run: 'docker build -t learn-ocaml-compilation --target=compilation .'
-      - name: Build ${{ matrix.archive }}
+      - name: 'Build ${{ matrix.arch_dir }}.zip'
         run: |
           docker run -i --rm -w /home/opam/install-prefix/share/learn-ocaml -u 0 --entrypoint='' learn-ocaml-compilation sh -c \
-          'apk add --no-cache zip >&2 && zip -r ${{ matrix.archive }} www >&2 && tar c ${{ matrix.archive }}' | \
+          'mv www "${{ matrix.arch_dir }}" >&2 && apk add --no-cache zip >&2 && zip -r "${{ matrix.arch_dir }}.zip" "${{ matrix.arch_dir }}" >&2 && tar c "${{ matrix.arch_dir }}.zip"' | \
           tar vx
-      - name: Upload ${{ matrix.archive }}
+      - name: 'Upload ${{ matrix.arch_dir }}.zip'
         uses: actions/upload-artifact@v2
         with:
-          name: ${{ matrix.archive }}
-          path: ${{ matrix.archive }}
+          name: '${{ matrix.arch_dir }}.zip'
+          path: '${{ matrix.arch_dir }}.zip'
   static-bin-linux:
     name: Builds static Linux binaries
     if: ${{ github.event_name != 'schedule' || github.repository == 'ocaml-sf/learn-ocaml' }}