Update CI to run on ubuntu-latest and directly cargo publish

Metaswitch · Sep 3, 2024 · 12d6a09 · 12d6a09
1 parent 13062b3
commit 12d6a09
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 25 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,11 +5,7 @@ on: [push, pull_request]
 jobs:
   check:
     runs-on: ubuntu-latest
-    container:
-      image: mcr.microsoft.com/cbl-mariner/base/core:2.0
     steps:
-      - name: Install dependencies
-        run: unset HOME; tdnf install -y build-essential git openssl-devel ca-certificates
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
@@ -24,12 +20,7 @@ jobs:
 
   test:
     runs-on: ubuntu-latest
-    container:
-      image: mcr.microsoft.com/cbl-mariner/base/core:2.0
-      options: --privileged
     steps:
-      - name: Install dependencies
-        run: unset HOME; tdnf install -y build-essential git openssl-devel ca-certificates tar helm
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
@@ -44,11 +35,7 @@ jobs:
 
   build:
     runs-on: ubuntu-latest
-    container:
-      image: mcr.microsoft.com/cbl-mariner/base/core:2.0
     steps:
-      - name: Install dependencies
-        run: unset HOME; tdnf install -y build-essential git openssl-devel ca-certificates
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
@@ -64,18 +51,12 @@ jobs:
 
   release-dry-run:
     runs-on: ubuntu-latest
-    container:
-      image: mcr.microsoft.com/cbl-mariner/base/core:2.0
     steps:
-      - name: Install dependencies
-        run: unset HOME; tdnf install -y build-essential git openssl-devel ca-certificates
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
           toolchain: stable
           override: true
-      - uses: katyo/publish-crates@v2
-        with:
-          dry-run: true
-          ignore-unpublished-changes: true
+      - name: Publish dry-run
+        run: cargo publish --dry-run
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,7 +14,7 @@ jobs:
         with:
           toolchain: stable
           override: true
-      - uses: katyo/publish-crates@v2
-        with:
-          registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }}
-          ignore-unpublished-changes: true
+      - name: Publish
+        run: cargo publish
+        env:
+          CARGO_PUBLISH_TOKEN: ${{ secrets.CARGO_PUBLISH_TOKEN }}