Skip to content

Commit e64bb63

Browse files
committed
fix release-plz
fix release-plz
1 parent e04c233 commit e64bb63

2 files changed

Lines changed: 15 additions & 6 deletions

File tree

.github/workflows/release-plz.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ jobs:
5151
concurrency:
5252
group: release-plz-${{ github.ref }}
5353
cancel-in-progress: false
54+
env:
55+
CARGO_HOME: /opt/cargo
56+
RUSTUP_HOME: /opt/rustup
5457
steps:
5558
- name: Install dependencies
5659
run: apt-get update && apt-get install -y curl git ca-certificates jq tar build-essential pkg-config libssl-dev cmake
@@ -62,9 +65,15 @@ jobs:
6265
token: ${{ secrets.GITHUB_TOKEN }}
6366
- name: Install Rust toolchain
6467
uses: dtolnay/rust-toolchain@stable
68+
- name: Mark workspace safe for git
69+
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
70+
- name: Install release-plz
71+
run: |
72+
curl -sSLf https://github.com/release-plz/release-plz/releases/latest/download/release-plz-x86_64-unknown-linux-gnu.tar.gz | tar xz -C /usr/local/bin
6573
- name: Run release-plz
66-
uses: release-plz/action@v0.5
67-
with:
68-
command: release-pr
74+
run: release-plz release-pr --git-token "$RELEASE_PLZ_TOKEN"
6975
env:
70-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
76+
RELEASE_PLZ_TOKEN: ${{ secrets.GITHUB_TOKEN }}
77+
- name: Clean up toolchains
78+
if: always()
79+
run: rm -rf /opt/cargo /opt/rustup

src/config/keybindings.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! Keyboard bindings: normal keys (`get_keys`) and prefix-mode keys (`get_desktop_keybinds`).
22
3-
use crate::actions::{argv, KeyAction, NamedAction};
4-
use crate::config::commands_common::{defaults, media, menu, scrot, ROFI_WINDOW_SWITCH};
3+
use crate::actions::{KeyAction, NamedAction, argv};
4+
use crate::config::commands_common::{ROFI_WINDOW_SWITCH, defaults, media, menu, scrot};
55
use crate::types::Key;
66

77
use super::keysyms::*;

0 commit comments

Comments
 (0)