Skip to content

Commit d69b124

Browse files
authored
Merge pull request #9 from avahahn/cli-ci-stuff
Cli ci stuff
2 parents 443f123 + 13aceb1 commit d69b124

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

.github/workflows/unitctl.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ on:
1010
- master
1111
tags:
1212
- '[0-9]+.[0-9]+.[0-9]+'
13+
- '[0-9]+.[0-9]+.[0-9]+-[0-9]+'
14+
workflow_dispatch:
15+
inputs:
16+
version:
17+
description: "Semver tag"
18+
type: environment
19+
required: true
1320

1421
permissions:
1522
contents: write
@@ -92,12 +99,6 @@ jobs:
9299
- run: rustup update stable
93100
- run: rustup target add ${{ matrix.target }}
94101

95-
- name: Install cross
96-
if: matrix.target == 'aarch64-unknown-linux-gnu'
97-
uses: taiki-e/install-action@v2
98-
with:
99-
tool: cross
100-
101102
- uses: Swatinem/rust-cache@v2
102103
with:
103104
prefix-key: rust-${{ matrix.build }}
@@ -136,7 +137,7 @@ jobs:
136137

137138
- name: Get the version from the tag
138139
run: |
139-
version=${{ github.ref_name }}
140+
version=${version:=${{ github.ref_name }}
140141
short="${version#*/}"
141142
echo $version; echo $short
142143
echo "VERSION=$version" >> $GITHUB_ENV

tools/unitctl/unit-client-rs/src/unitd_configure_options.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ mod tests {
221221
}
222222

223223
#[test]
224+
#[ignore] // run this one manually - not in CI
224225
fn can_run_unitd() {
225226
let specific_path = std::env::var(UNITD_PATH_ENV_KEY).map_err(|error| Box::new(error) as Box<dyn stdError>);
226227
let unitd_path = unitd_instance::find_executable_path(specific_path);

0 commit comments

Comments
 (0)