Release v3.0.1

SimonDegraeve · Sep 28, 2020 · 199ba21 · 199ba21
1 parent 239309b
commit 199ba21
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 45 deletions.
diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
@@ -69,46 +69,41 @@ jobs:
         shell: bash
         run: |
           # from https://stackoverflow.com/a/24848739/617787
-          s=$(pwd); d=$(dirname $(esy x which res-react-intl-ppx));
+          s=$(pwd); d=$(dirname $(esy x which ppx));
           while [ "${d#$s/}" == "${d}" ]
           do s=$(dirname $s);b="../${b}"; done;
           if [ "${{ matrix.os }}" == "windows-latest" ]; then
-            ESY__BINARY_PATH=${b}${d#$s/}/res-react-intl-ppx.exe
+            ESY__BINARY_PATH=${b}${d#$s/}/ppx.exe
           else
-            ESY__BINARY_PATH=${b}${d#$s/}/res-react-intl-ppx
+            ESY__BINARY_PATH=${b}${d#$s/}/ppx
           fi
           echo "ESY__BINARY_PATH: $ESY__BINARY_PATH"
           echo "##[set-output name=path;]$ESY__BINARY_PATH"
 
-      - name: Upload artifacts for ${{ matrix.os }} [Ppx]
-        if: github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/')
-        uses: actions/upload-artifact@master
-        with:
-          name: ${{ matrix.os }}-ppx
-          path: ${{ steps.esy_binary_path_ppx.outputs.path }}
-
       - name: Get Esy binary path [Extract]
         id: esy_binary_path_extract
         shell: bash
         run: |
           # from https://stackoverflow.com/a/24848739/617787
-          s=$(pwd); d=$(dirname $(esy x which res-react-intl-extract));
+          s=$(pwd); d=$(dirname $(esy x which extract));
           while [ "${d#$s/}" == "${d}" ]
           do s=$(dirname $s);b="../${b}"; done;
           if [ "${{ matrix.os }}" == "windows-latest" ]; then
-            ESY__BINARY_PATH=${b}${d#$s/}/res-react-intl-extract.exe
+            ESY__BINARY_PATH=${b}${d#$s/}/extract.exe
           else
-            ESY__BINARY_PATH=${b}${d#$s/}/res-react-intl-extract
+            ESY__BINARY_PATH=${b}${d#$s/}/extract
           fi
           echo "ESY__BINARY_PATH: $ESY__BINARY_PATH"
           echo "##[set-output name=path;]$ESY__BINARY_PATH"
 
-      - name: Upload artifacts for ${{ matrix.os }} [Extract]
+      - name: Upload artifacts for ${{ matrix.os }}
         if: github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/')
         uses: actions/upload-artifact@master
         with:
-          name: ${{ matrix.os }}-extract
-          path: ${{ steps.esy_binary_path_extract.outputs.path }}
+          name: ${{ matrix.os }}
+          path: |
+            ${{ steps.esy_binary_path_ppx.outputs.path }}
+            ${{ steps.esy_binary_path_extract.outputs.path }}
 
   publish:
     needs: build_and_test
@@ -126,41 +121,23 @@ jobs:
       - name: Make NPM release skeleton
         run: node script/release-make-skeleton.js
 
-      - name: Download linux artifacts [Ppx]
-        uses: actions/download-artifact@master
-        with:
-          name: ubuntu-latest-ppx
-          path: _release/platform-linux-x64/ppx
-
-      - name: Download macOS artifacts [Ppx]
-        uses: actions/download-artifact@master
-        with:
-          name: macos-latest-ppx
-          path: _release/platform-darwin-x64/ppx
-
-      - name: Download windows artifacts [Ppx]
-        uses: actions/download-artifact@master
-        with:
-          name: windows-latest-ppx
-          path: _release/platform-windows-x64/ppx
-
-      - name: Download linux artifacts [Extract]
+      - name: Download linux artifacts
         uses: actions/download-artifact@master
         with:
-          name: ubuntu-latest-extract
-          path: _release/platform-linux-x64/extract
+          name: ubuntu-latest
+          path: _release/platform-linux-x64
 
-      - name: Download macOS artifacts [Extract]
+      - name: Download macOS artifacts
         uses: actions/download-artifact@master
         with:
-          name: macos-latest-extract
-          path: _release/platform-darwin-x64/extract
+          name: macos-latest
+          path: _release/platform-darwin-x64
 
-      - name: Download windows artifacts [Extract]
+      - name: Download windows artifacts
         uses: actions/download-artifact@master
         with:
-          name: windows-latest-extract
-          path: _release/platform-windows-x64/extract
+          name: windows-latest
+          path: _release/platform-windows-x64
 
       - name: Create archives for Github release
         run: |

diff --git a/bin/dune b/bin/dune
@@ -1,6 +1,6 @@
 (executables
   (names Ppx Extract)
-  (public_names res-react-intl-ppx res-react-intl-extract)
+  (public_names ppx extract)
   (libraries res-react-intl.lib)
   (ocamlopt_flags ( -linkall ))
   (package res-react-intl)

diff --git a/esy.json b/esy.json
@@ -1,6 +1,6 @@
 {
   "name": "res-react-intl",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "Reason/OCaml PPX generating ReactIntl `id` from `defaultMessage`",
   "author": "Simon Degraeve <simon.degraeve@gmail.com>",
   "license": "MIT",