Merge pull request RustPython#4096 from youknowone/gitattributes

youknowone · web-flow · commit 78c0f7b7a923 · 2022-08-18T08:08:00.000+09:00
more gitattributes and fix wasm CI to use rust-cache
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1,8 @@
-Lib/** linguist-vendored
+Lib/**      linguist-vendored
+Cargo.lock  linguist-generated -merge
 parser/src/python.rs linguist-generated -diff -merge
+ast/src/ast_gen.rs          linguist-generated -merge
+vm/src/stdlib/ast/gen.rs    linguist-generated -merge
+parser/python.lalrpop       text eol=LF
+Lib/*.py    text working-tree-encoding=UTF-8 eol=LF
+**/*.rs     text working-tree-encoding=UTF-8 eol=LF
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -301,21 +301,11 @@ jobs:
 
   wasm:
     name: Check the WASM package and demo
-    needs: rust_tests
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: dtolnay/rust-toolchain@stable
-      - name: Cache cargo dependencies
-        uses: actions/cache@v2
-        with:
-          path: |
-              ~/.cargo/registry
-              ~/.cargo/git
-              target
-          key: ${{ runner.os }}-wasm_opt3-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: |
-               ${{ runner.os }}-debug_opt3-${{ hashFiles('**/Cargo.lock') }}
+      - uses: Swatinem/rust-cache@v1
       - name: install wasm-pack
         run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
       - name: install geckodriver
@@ -359,20 +349,11 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
         with:
           target: wasm32-wasi
+      - uses: Swatinem/rust-cache@v1
       - name: Setup Wasmer
         uses: wasmerio/setup-wasmer@v1
       - name: Install clang
         run: sudo apt-get update && sudo apt-get install clang -y
-      - name: Cache cargo dependencies
-        uses: actions/cache@v2
-        with:
-          path: |
-              ~/.cargo/registry
-              ~/.cargo/git
-              target
-          key: ${{ runner.os }}-wasm_opt3-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: |
-               ${{ runner.os }}-debug_opt3-${{ hashFiles('**/Cargo.lock') }}
       - name: build rustpython
         run: cargo build --release --target wasm32-wasi --features freeze-stdlib,stdlib --verbose
       - name: run snippets
