Skip to content

Commit d8fcd3b

Browse files
authored
Merge pull request #7 from microsoft/update_ci
Update CI to run on ubuntu-latest and directly cargo publish
2 parents b8ee659 + 12d6a09 commit d8fcd3b

File tree

2 files changed

+6
-25
lines changed

2 files changed

+6
-25
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@ on: [push, pull_request]
55
jobs:
66
check:
77
runs-on: ubuntu-latest
8-
container:
9-
image: mcr.microsoft.com/cbl-mariner/base/core:2.0
108
steps:
11-
- name: Install dependencies
12-
run: unset HOME; tdnf install -y build-essential git openssl-devel ca-certificates
139
- uses: actions/checkout@v2
1410
- uses: actions-rs/toolchain@v1
1511
with:
@@ -24,12 +20,7 @@ jobs:
2420

2521
test:
2622
runs-on: ubuntu-latest
27-
container:
28-
image: mcr.microsoft.com/cbl-mariner/base/core:2.0
29-
options: --privileged
3023
steps:
31-
- name: Install dependencies
32-
run: unset HOME; tdnf install -y build-essential git openssl-devel ca-certificates tar helm
3324
- uses: actions/checkout@v2
3425
- uses: actions-rs/toolchain@v1
3526
with:
@@ -44,11 +35,7 @@ jobs:
4435

4536
build:
4637
runs-on: ubuntu-latest
47-
container:
48-
image: mcr.microsoft.com/cbl-mariner/base/core:2.0
4938
steps:
50-
- name: Install dependencies
51-
run: unset HOME; tdnf install -y build-essential git openssl-devel ca-certificates
5239
- uses: actions/checkout@v2
5340
- uses: actions-rs/toolchain@v1
5441
with:
@@ -64,18 +51,12 @@ jobs:
6451

6552
release-dry-run:
6653
runs-on: ubuntu-latest
67-
container:
68-
image: mcr.microsoft.com/cbl-mariner/base/core:2.0
6954
steps:
70-
- name: Install dependencies
71-
run: unset HOME; tdnf install -y build-essential git openssl-devel ca-certificates
7255
- uses: actions/checkout@v2
7356
- uses: actions-rs/toolchain@v1
7457
with:
7558
profile: minimal
7659
toolchain: stable
7760
override: true
78-
- uses: katyo/publish-crates@v2
79-
with:
80-
dry-run: true
81-
ignore-unpublished-changes: true
61+
- name: Publish dry-run
62+
run: cargo publish --dry-run

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
with:
1515
toolchain: stable
1616
override: true
17-
- uses: katyo/publish-crates@v2
18-
with:
19-
registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }}
20-
ignore-unpublished-changes: true
17+
- name: Publish
18+
run: cargo publish
19+
env:
20+
CARGO_PUBLISH_TOKEN: ${{ secrets.CARGO_PUBLISH_TOKEN }}

0 commit comments

Comments
 (0)