Skip to content

Commit

Permalink
ci: update actions (#137)
Browse files Browse the repository at this point in the history
* ci: update actions

* remove pnpm

* remove node

* sinplify checkout

* clippy on all platforms

* PR message

* fix clippy

* rename file

* name workflow
  • Loading branch information
amrbashir authored Oct 24, 2023
1 parent 26580cf commit 7bd75b8
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 59 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ jobs:
audit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: rust audit
uses: actions-rs/audit-check@v1
- uses: actions/checkout@v4
- uses: rustsec/audit-check@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
36 changes: 15 additions & 21 deletions .github/workflows/clippy-fmt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,39 +16,33 @@ concurrency:

jobs:
clippy:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
platform: [ubuntu-latest, macos-latest, windows-latest]

runs-on: ${{ matrix.platform }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: install system deps
if: matrix.platform == 'ubuntu-latest'
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev libxdo-dev libwebkit2gtk-4.1-dev
- name: install stable
uses: actions-rs/toolchain@v1
- uses: dtolnay/rust-toolchain@stable
with:
profile: minimal
toolchain: stable
override: true
components: clippy

- uses: actions-rs/cargo@v1
with:
command: clippy
args: --all-targets --all-features -- -D warnings
- run: cargo clippy --all-targets --all-features -- -D warnings

fmt:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: install stable
uses: actions-rs/toolchain@v1
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
with:
profile: minimal
toolchain: stable
override: true
components: rustfmt

- uses: actions-rs/cargo@v1
with:
command: fmt
args: --all -- --check
- run: cargo fmt --all -- --check
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: actions/checkout@v4
- name: covector status
uses: jbolda/covector/packages/action@covector-v0
id: covector
Expand Down
19 changes: 4 additions & 15 deletions .github/workflows/covector-version-or-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0
# SPDX-License-Identifier: MIT

name: version or publish
name: covector version or publish

on:
push:
Expand All @@ -19,22 +19,11 @@ jobs:
successfulPublish: ${{ steps.covector.outputs.successfulPublish }}

steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0

- uses: pnpm/[email protected]
with:
version: 7
- name: Setup node
uses: actions/setup-node@v3
with:
node-version: 16
check-latest: true
registry-url: 'https://registry.npmjs.org'
- uses: actions/checkout@v4

- name: cargo login
run: cargo login ${{ secrets.ORG_CRATES_IO_TOKEN }}

- name: git config
run: |
git config --global user.name "${{ github.event.pusher.name }}"
Expand All @@ -55,8 +44,8 @@ jobs:
uses: tauri-apps/create-pull-request@v3
with:
token: ${{ secrets.GITHUB_TOKEN }}
branch: release/version-updates
title: Apply Version Updates From Current Changes
commit-message: 'apply version updates'
labels: 'version updates'
branch: 'release'
body: ${{ steps.covector.outputs.change }}
14 changes: 3 additions & 11 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,13 @@ jobs:
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: install system deps
if: contains(matrix.os, 'ubuntu')
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev libxdo-dev libwebkit2gtk-4.1-dev
- name: install stable
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
override: true

- uses: actions-rs/cargo@v1
with:
command: test
- uses: dtolnay/rust-toolchain@stable
- run: cargo test
12 changes: 6 additions & 6 deletions src/platform_impl/macos/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -703,12 +703,12 @@ impl MenuChild {
.as_mut()
.unwrap()
.entry(menu_id)
.or_insert_with(Vec::new)
.or_default()
.push(NsMenuRef(id, ns_submenu));

self.ns_menu_items
.entry(menu_id)
.or_insert_with(Vec::new)
.or_default()
.push(NsMenuItemRef(ns_menu_item));

Ok(ns_menu_item)
Expand All @@ -735,7 +735,7 @@ impl MenuChild {

self.ns_menu_items
.entry(menu_id)
.or_insert_with(Vec::new)
.or_default()
.push(NsMenuItemRef(ns_menu_item));

Ok(ns_menu_item)
Expand Down Expand Up @@ -772,7 +772,7 @@ impl MenuChild {

self.ns_menu_items
.entry(menu_id)
.or_insert_with(Vec::new)
.or_default()
.push(NsMenuItemRef(ns_menu_item));

Ok(ns_menu_item)
Expand Down Expand Up @@ -802,7 +802,7 @@ impl MenuChild {

self.ns_menu_items
.entry(menu_id)
.or_insert_with(Vec::new)
.or_default()
.push(NsMenuItemRef(ns_menu_item));

Ok(ns_menu_item)
Expand Down Expand Up @@ -835,7 +835,7 @@ impl MenuChild {

self.ns_menu_items
.entry(menu_id)
.or_insert_with(Vec::new)
.or_default()
.push(NsMenuItemRef(ns_menu_item));

Ok(ns_menu_item)
Expand Down

0 comments on commit 7bd75b8

Please sign in to comment.