Browse Source

Bump actions/checkout from v1 to v2 (#308)

* Bump actions/checkout from v1 to v2

* Update smoke-test-prod.yml

* Update smoke-tests-source.yml

* Update test-on-pr.yml
BSKY 5 years ago
parent
commit
561677864c

+ 13 - 13
.github/workflows/cargo-publish.yml

@@ -8,16 +8,16 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
-    - name: Login to Crates.IO
-      run: cargo login ${{ secrets.crate_token }}
-    - name: Publish CLI
-      run: |
-        cd cli/tauri-cli
-        echo "We will publish this directory."
-        ls # cargo publish
-    - name: Publish TAURI
-      run: |
-        cd tauri
-        echo "We will publish this directory."
-        ls # TAURI_DIST_DIR=../../test/fixture/dist cargo publish
+      - uses: actions/checkout@v2
+      - name: Login to Crates.IO
+        run: cargo login ${{ secrets.crate_token }}
+      - name: Publish CLI
+        run: |
+          cd cli/tauri-cli
+          echo "We will publish this directory."
+          ls # cargo publish
+      - name: Publish TAURI
+        run: |
+          cd tauri
+          echo "We will publish this directory."
+          ls # TAURI_DIST_DIR=../../test/fixture/dist cargo publish

+ 8 - 8
.github/workflows/npm-publish.yml

@@ -8,11 +8,11 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
-    - name: Login to NPM
-      run: npm login ${{ secrets.npm_token }}
-    - name: Publish package
-      run: |
-        cd packages/tauri-js
-        echo "We will publish this directory."
-        ls # npm publish
+      - uses: actions/checkout@v2
+      - name: Login to NPM
+        run: npm login ${{ secrets.npm_token }}
+      - name: Publish package
+        run: |
+          cd packages/tauri-js
+          echo "We will publish this directory."
+          ls # npm publish

+ 48 - 50
.github/workflows/smoke-test-prod.yml

@@ -23,55 +23,53 @@ jobs:
             CARGO_HOME: ~/.cargo
 
     steps:
-    - uses: actions/checkout@v1
-      with:
-        fetch-depth: 3
-    - name: install rust stable
-      uses: actions-rs/toolchain@v1
-      with:
+      - uses: actions/checkout@v2
+      - name: install rust stable
+        uses: actions-rs/toolchain@v1
+        with:
           toolchain: stable
           profile: minimal
-    - name: install webkit2gtk (ubuntu only)
-      if: matrix.platform == 'ubuntu-latest'
-      run: |
-           sudo apt-get update
-           sudo apt-get install -y webkit2gtk-4.0
-    - name: cache rust bin
-      id: cache_rust_bin
-      uses: actions/cache@v1
-      with:
-        path: ${{ format('{0}/bin/', matrix.CARGO_HOME) }}
-        key: ${{ runner.OS }}-build-bin-${{ hashFiles('**/Cargo.toml') }}-
-    - name: cache rust registry/index
-      id: cache_rust_reg_index
-      uses: actions/cache@v1
-      with:
-        path: ${{ format('{0}/registry/index/', matrix.CARGO_HOME) }}
-        key: ${{ runner.OS }}-build-reg-index-${{ hashFiles('**/Cargo.toml') }}-
-    - name: cache rust registry/cache
-      id: cache_rust_reg_cache
-      uses: actions/cache@v1
-      with:
-        path: ${{ format('{0}/registry/cache/', matrix.CARGO_HOME) }}
-        key: ${{ runner.OS }}-build-reg-cache-${{ hashFiles('**/Cargo.toml') }}-
-    - run: cargo install tauri-cli --force
-      # if we pull from cache, this will be skipped, but force just in case cache has an issue but it does exist
-      if: steps.cache_rust_bin.outputs.cache-hit != 'true' || steps.cache_rust_reg_index.outputs.cache-hit != 'true' || steps.cache_rust_reg_cache.outputs.cache-hit != 'true'
-    - name: cache node modules
-      uses: actions/cache@v1
-      with:
-        path: ${{ format('examples/{0}/node_modules', matrix.example) }}
-        key: ${{ runner.OS }}-build-${{ hashFiles(format('examples/{0}/yarn.lock', matrix.example)) }}
-        restore-keys: ${{ runner.OS }}-build-${{ env.cache-name }}-
-    - name: install via yarn
-      run: |
-           cd ./examples/${{ matrix.example }}
-           yarn
-    - name: build example
-      run: |
-           cd ./examples/${{ matrix.example }}
-           yarn build
-    - name: yarn tauri build
-      run: |
-           cd ./examples/${{ matrix.example }}
-           yarn tauri:prod:build
+      - name: install webkit2gtk (ubuntu only)
+        if: matrix.platform == 'ubuntu-latest'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y webkit2gtk-4.0
+      - name: cache rust bin
+        id: cache_rust_bin
+        uses: actions/cache@v1
+        with:
+          path: ${{ format('{0}/bin/', matrix.CARGO_HOME) }}
+          key: ${{ runner.OS }}-build-bin-${{ hashFiles('**/Cargo.toml') }}-
+      - name: cache rust registry/index
+        id: cache_rust_reg_index
+        uses: actions/cache@v1
+        with:
+          path: ${{ format('{0}/registry/index/', matrix.CARGO_HOME) }}
+          key: ${{ runner.OS }}-build-reg-index-${{ hashFiles('**/Cargo.toml') }}-
+      - name: cache rust registry/cache
+        id: cache_rust_reg_cache
+        uses: actions/cache@v1
+        with:
+          path: ${{ format('{0}/registry/cache/', matrix.CARGO_HOME) }}
+          key: ${{ runner.OS }}-build-reg-cache-${{ hashFiles('**/Cargo.toml') }}-
+      - run: cargo install tauri-cli --force
+        # if we pull from cache, this will be skipped, but force just in case cache has an issue but it does exist
+        if: steps.cache_rust_bin.outputs.cache-hit != 'true' || steps.cache_rust_reg_index.outputs.cache-hit != 'true' || steps.cache_rust_reg_cache.outputs.cache-hit != 'true'
+      - name: cache node modules
+        uses: actions/cache@v1
+        with:
+          path: ${{ format('examples/{0}/node_modules', matrix.example) }}
+          key: ${{ runner.OS }}-build-${{ hashFiles(format('examples/{0}/yarn.lock', matrix.example)) }}
+          restore-keys: ${{ runner.OS }}-build-${{ env.cache-name }}-
+      - name: install via yarn
+        run: |
+          cd ./examples/${{ matrix.example }}
+          yarn
+      - name: build example
+        run: |
+          cd ./examples/${{ matrix.example }}
+          yarn build
+      - name: yarn tauri build
+        run: |
+          cd ./examples/${{ matrix.example }}
+          yarn tauri:prod:build

+ 61 - 63
.github/workflows/smoke-tests-source.yml

@@ -12,16 +12,16 @@ jobs:
       matrix:
         platform: [ubuntu-latest, macos-latest, windows-latest]
         example:
-          - name : GatsbyThemedSite
+          - name: GatsbyThemedSite
             folder: react/gatsby-themed-site
             executable: gatsby-themed-site-app
-          - name : CRAApp
+          - name: CRAApp
             folder: react/create-react-app
             executable: app
-          - name : NextjsApp
+          - name: NextjsApp
             folder: react/next.js
             executable: app
-          - name : VanillajsMonolithApp
+          - name: VanillajsMonolithApp
             folder: vanillajs/monolith
             executable: app
           - name: quasar-app
@@ -45,64 +45,62 @@ jobs:
             ext: .x86.msi
 
     steps:
-    - uses: actions/checkout@v1
-      with:
-        fetch-depth: 3
-    - name: install rust stable
-      uses: actions-rs/toolchain@v1
-      with:
+      - uses: actions/checkout@v2
+      - name: install rust stable
+        uses: actions-rs/toolchain@v1
+        with:
           toolchain: stable
           profile: minimal
-    - name: install webkit2gtk (ubuntu only)
-      if: matrix.platform == 'ubuntu-latest'
-      run: |
-           sudo apt-get update
-           sudo apt-get install -y webkit2gtk-4.0
-    - name: cache rust bin
-      uses: actions/cache@v1
-      with:
-        path: ${{ format('{0}/bin/', matrix.CARGO_HOME) }}
-        key: ${{ runner.OS }}-build-bin-${{ hashFiles('**/Cargo.toml') }}-
-    - name: cache rust registry/index
-      uses: actions/cache@v1
-      with:
-        path: ${{ format('{0}/registry/index/', matrix.CARGO_HOME) }}
-        key: ${{ runner.OS }}-build-reg-index-${{ hashFiles('**/Cargo.toml') }}-
-    - name: cache rust registry/cache
-      uses: actions/cache@v1
-      with:
-        path: ${{ format('{0}/registry/cache/', matrix.CARGO_HOME) }}
-        key: ${{ runner.OS }}-build-reg-cache-${{ hashFiles('**/Cargo.toml') }}-
-    - name: build rust
-      run: cargo build
-      env:
-        TAURI_DIST_DIR: ../../test/fixture/dist
-        TAURI_DIR: ../test/fixture/src-tauri
-    - run: cargo install --path ./cli/tauri-cli --force
-    - name: install cli deps via yarn
-      run: |
-           cd ./cli/tauri.js
-           yarn
-    - name: cache node modules
-      uses: actions/cache@v1
-      with:
-        path: ${{ format('examples/{0}/node_modules', matrix.example.folder) }}
-        key: ${{ runner.OS }}-build-${{ hashFiles(format('examples/{0}/yarn.lock', matrix.example.folder)) }}
-        restore-keys: ${{ runner.OS }}-build-${{ env.cache-name }}-
-    - name: install via yarn
-      run: |
-           cd ./examples/${{ matrix.example.folder }}
-           yarn
-    - name: build example
-      run: |
-           cd ./examples/${{ matrix.example.folder }}
-           yarn build
-    - name: yarn tauri build
-      run: |
-           cd ./examples/${{ matrix.example.folder }}
-           yarn tauri:source:build
-    - uses: actions/upload-artifact@v1
-      if: success()
-      with:
-        name: ${{ matrix.example.name }}(${{ matrix.platform }})
-        path: ${{ format('./examples/{0}/src-tauri/{1}/{2}{3}', matrix.example.folder, matrix.releaseFolder, matrix.example.executable, matrix.ext ) }}
+      - name: install webkit2gtk (ubuntu only)
+        if: matrix.platform == 'ubuntu-latest'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y webkit2gtk-4.0
+      - name: cache rust bin
+        uses: actions/cache@v1
+        with:
+          path: ${{ format('{0}/bin/', matrix.CARGO_HOME) }}
+          key: ${{ runner.OS }}-build-bin-${{ hashFiles('**/Cargo.toml') }}-
+      - name: cache rust registry/index
+        uses: actions/cache@v1
+        with:
+          path: ${{ format('{0}/registry/index/', matrix.CARGO_HOME) }}
+          key: ${{ runner.OS }}-build-reg-index-${{ hashFiles('**/Cargo.toml') }}-
+      - name: cache rust registry/cache
+        uses: actions/cache@v1
+        with:
+          path: ${{ format('{0}/registry/cache/', matrix.CARGO_HOME) }}
+          key: ${{ runner.OS }}-build-reg-cache-${{ hashFiles('**/Cargo.toml') }}-
+      - name: build rust
+        run: cargo build
+        env:
+          TAURI_DIST_DIR: ../../test/fixture/dist
+          TAURI_DIR: ../test/fixture/src-tauri
+      - run: cargo install --path ./cli/tauri-cli --force
+      - name: install cli deps via yarn
+        run: |
+          cd ./cli/tauri.js
+          yarn
+      - name: cache node modules
+        uses: actions/cache@v1
+        with:
+          path: ${{ format('examples/{0}/node_modules', matrix.example.folder) }}
+          key: ${{ runner.OS }}-build-${{ hashFiles(format('examples/{0}/yarn.lock', matrix.example.folder)) }}
+          restore-keys: ${{ runner.OS }}-build-${{ env.cache-name }}-
+      - name: install via yarn
+        run: |
+          cd ./examples/${{ matrix.example.folder }}
+          yarn
+      - name: build example
+        run: |
+          cd ./examples/${{ matrix.example.folder }}
+          yarn build
+      - name: yarn tauri build
+        run: |
+          cd ./examples/${{ matrix.example.folder }}
+          yarn tauri:source:build
+      - uses: actions/upload-artifact@v1
+        if: success()
+        with:
+          name: ${{ matrix.example.name }}(${{ matrix.platform }})
+          path: ${{ format('./examples/{0}/src-tauri/{1}/{2}{3}', matrix.example.folder, matrix.releaseFolder, matrix.example.executable, matrix.ext ) }}

+ 31 - 37
.github/workflows/test-on-pr.yml

@@ -12,25 +12,23 @@ jobs:
         platform: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
-    - uses: actions/checkout@v1
-      with:
-        fetch-depth: 3
-    - name: install stable
-      uses: actions-rs/toolchain@v1
-      with:
+      - uses: actions/checkout@v2
+      - name: install stable
+        uses: actions-rs/toolchain@v1
+        with:
           toolchain: stable
-    - name: install webkit2gtk (ubuntu only)
-      if: matrix.platform == 'ubuntu-latest'
-      run: |
-           sudo apt-get update
-           sudo apt-get install -y webkit2gtk-4.0
-    - name: build
-      run: |
-           cd ./tauri
-           cargo build
-      env:
-        TAURI_DIST_DIR: ../../test/fixture/dist
-        TAURI_DIR: ../test/fixture/src-tauri
+      - name: install webkit2gtk (ubuntu only)
+        if: matrix.platform == 'ubuntu-latest'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y webkit2gtk-4.0
+      - name: build
+        run: |
+          cd ./tauri
+          cargo build
+        env:
+          TAURI_DIST_DIR: ../../test/fixture/dist
+          TAURI_DIR: ../test/fixture/src-tauri
 
   build-tauri-bundler:
     runs-on: ${{ matrix.platform }}
@@ -41,17 +39,15 @@ jobs:
         platform: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
-    - uses: actions/checkout@v1
-      with:
-        fetch-depth: 3
-    - name: install stable
-      uses: actions-rs/toolchain@v1
-      with:
+      - uses: actions/checkout@v2
+      - name: install stable
+        uses: actions-rs/toolchain@v1
+        with:
           toolchain: stable
-    - name: build
-      run: |
-           cd ./cli/tauri-cli
-           cargo build
+      - name: build
+        run: |
+          cd ./cli/tauri-cli
+          cargo build
 
   test-tauri-js-cli:
     runs-on: ${{ matrix.platform }}
@@ -62,12 +58,10 @@ jobs:
         platform: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
-    - uses: actions/checkout@v1
-      with:
-        fetch-depth: 3
-    - name: test
-      timeout-minutes: 15
-      run: |
-           cd ./cli/tauri.js
-           yarn
-           yarn test
+      - uses: actions/checkout@v2
+      - name: test
+        timeout-minutes: 15
+        run: |
+          cd ./cli/tauri.js
+          yarn
+          yarn test