From 8bae78eca0d4abcfd2cfa4b413c0219ead4bec05 Mon Sep 17 00:00:00 2001 From: tatchi Date: Fri, 12 Jun 2020 15:51:17 +0200 Subject: [PATCH 1/2] upgrade-ci-actions --- .github/workflows/publish.yml | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a1524b4..5d77b13 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -9,6 +9,7 @@ jobs: build-platform: runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: os: [ubuntu-latest, macOS-latest, windows-latest] steps: @@ -16,13 +17,13 @@ jobs: - uses: actions/setup-node@v1 with: node-version: 12 - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Install esy run: npm install -g esy # Install and build - name: Try to restore install cache - uses: actions/cache@v1 + uses: actions/cache@v2 with: path: ~/.esy/source key: source-${{ matrix.os }}-${{ hashFiles('**/index.json') }} @@ -35,7 +36,7 @@ jobs: run: node .github/workflows/print_esy_cache.js - name: Try to restore dependencies cache id: deps-cache - uses: actions/cache@v1 + uses: actions/cache@v2 with: path: ${{ steps.print_esy_cache.outputs.esy_cache }} key: build-${{ matrix.os }}-${{ hashFiles('**/index.json') }} @@ -59,24 +60,27 @@ jobs: with: node-version: 12 registry-url: https://registry.npmjs.org/ - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 with: fetch-depth: 1 ref: ${{ github.ref }} submodules: true # Download platform artifacts - name: Download Linux release - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v2 with: name: ubuntu-latest + path: ubuntu-latest - name: Download Windows release - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v2 with: name: windows-latest + path: windows-latest - name: Download macOS release - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v2 with: name: macOS-latest + path: macOS-latest # Move artifacts in place - name: Move artifacts run: | @@ -112,17 +116,18 @@ jobs: needs: prepare-publish runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: os: [ubuntu-latest, macOS-latest, windows-latest] steps: - uses: actions/setup-node@v1 with: node-version: 12 - - name: Download Linux release - uses: actions/download-artifact@v1 + - name: Download ${{ matrix.os }} release + uses: actions/download-artifact@v2 with: name: release-tarball - name: test install - run: npm -g install ./release-tarball/redemon.tgz + run: npm -g install ./redemon.tgz - name: test binary run: redemon --help From b17dd77e5e032f3d53541bc262e18e79a24f6857 Mon Sep 17 00:00:00 2001 From: tatchi Date: Sat, 13 Jun 2020 19:31:30 +0200 Subject: [PATCH 2/2] format --- bin/main.ml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/main.ml b/bin/main.ml index 486cac4..088c3db 100644 --- a/bin/main.ml +++ b/bin/main.ml @@ -48,8 +48,10 @@ let redemon path paths extensions delay verbose command args = let is_file_extension e = String.equal ("." ^ e) file_extension in - if extensions_provided && List.exists is_file_extension extensions then - stop_program () |> start_program)) + if + extensions_provided + && List.exists is_file_extension extensions + then stop_program () |> start_program)) paths in start_program ();