diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 578b1a3c5..a9940b0c4 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -2,7 +2,7 @@ name: Deploy Nightly Docs on: push: branches: - - master + - main jobs: deploy: @@ -21,7 +21,7 @@ jobs: - uses: Swatinem/rust-cache@v2 with: cache-all-crates: "true" - save-if: ${{ github.ref == 'refs/heads/master' }} + save-if: ${{ github.ref == 'refs/heads/main' }} - uses: ilammy/setup-nasm@v1 - name: cargo doc diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 48fdfddcb..e9c0cf3c8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,7 +3,7 @@ name: Rust CI on: push: branches: - - master + - main paths: - packages/** - examples/** @@ -17,7 +17,7 @@ on: pull_request: types: [opened, synchronize, reopened, ready_for_review] branches: - - master + - main paths: - packages/** - examples/** @@ -48,7 +48,7 @@ jobs: - uses: Swatinem/rust-cache@v2 with: cache-all-crates: "true" - save-if: ${{ github.ref == 'refs/heads/master' }} + save-if: ${{ github.ref == 'refs/heads/main' }} - uses: ilammy/setup-nasm@v1 - run: cargo check --all --examples --tests --all-features --all-targets @@ -64,7 +64,7 @@ jobs: - uses: Swatinem/rust-cache@v2 with: cache-all-crates: "true" - save-if: ${{ github.ref == 'refs/heads/master' }} + save-if: ${{ github.ref == 'refs/heads/main' }} - uses: ilammy/setup-nasm@v1 - uses: davidB/rust-cargo-make@v1 - uses: browser-actions/setup-firefox@latest @@ -91,7 +91,7 @@ jobs: - uses: Swatinem/rust-cache@v2 with: cache-all-crates: "true" - save-if: ${{ github.ref == 'refs/heads/master' }} + save-if: ${{ github.ref == 'refs/heads/main' }} - run: cargo fmt --all -- --check clippy: @@ -109,7 +109,7 @@ jobs: - uses: Swatinem/rust-cache@v2 with: cache-all-crates: "true" - save-if: ${{ github.ref == 'refs/heads/master' }} + save-if: ${{ github.ref == 'refs/heads/main' }} - run: cargo clippy --workspace --examples --tests --all-features --all-targets -- -D warnings playwright: @@ -137,7 +137,7 @@ jobs: - uses: Swatinem/rust-cache@v2 with: cache-all-crates: "true" - save-if: ${{ github.ref == 'refs/heads/master' }} + save-if: ${{ github.ref == 'refs/heads/main' }} - name: Install dependencies run: npm ci @@ -230,7 +230,7 @@ jobs: with: key: "${{ matrix.platform.target }}" cache-all-crates: "true" - save-if: ${{ github.ref == 'refs/heads/master' }} + save-if: ${{ github.ref == 'refs/heads/main' }} - name: test run: | diff --git a/packages/html/src/global_attributes.rs b/packages/html/src/global_attributes.rs index b9f06a754..cbac1d87e 100644 --- a/packages/html/src/global_attributes.rs +++ b/packages/html/src/global_attributes.rs @@ -2285,8 +2285,8 @@ trait_methods! { /// transform_origin: "transform-origin"; - /// - r#type: "_type"; + /// + r#type: "type"; /// u1: "u1";