Fix CI 8

michalszmidt · Jul 19, 2023 · 98adf29 · 98adf29
1 parent a3f4821
commit 98adf29
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 23 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -1,6 +1,4 @@
 relese_linux_glibc_amd64_task:
-  cpu: 8
-  memory: 6G
   only_if: $CIRRUS_BRANCH == 'master'
   only_if: $CIRRUS_RELEASE != ''
   env:
@@ -30,8 +28,6 @@ relese_linux_glibc_amd64_task:
     - files_to_upload=($(ls | grep hctl)); . ./upload.sh
 
 relese_linux_glibc_aarch64_task:
-  cpu: 8
-  memory: 6G
   only_if: $CIRRUS_BRANCH == 'master'
   only_if: $CIRRUS_RELEASE != ''
   env:
@@ -61,8 +57,6 @@ relese_linux_glibc_aarch64_task:
     - files_to_upload=($(ls | grep hctl)); . ./upload.sh
 
 relese_linux_musl_amd64_task:
-  cpu: 8
-  memory: 6G
   only_if: $CIRRUS_BRANCH == 'master'
   only_if: $CIRRUS_RELEASE != ''
   env:
@@ -93,8 +87,6 @@ relese_linux_musl_amd64_task:
 
 
 relese_linux_musl_aarch64_task:
-  cpu: 8
-  memory: 6G
   only_if: $CIRRUS_BRANCH == 'master'
   only_if: $CIRRUS_RELEASE != ''
   env:
@@ -123,8 +115,6 @@ relese_linux_musl_aarch64_task:
     - files_to_upload=($(ls | grep hctl)); . ./upload.sh
 
 relese_freebsd_amd64_task:
-  cpu: 8
-  memory: 6G
   only_if: $CIRRUS_BRANCH == 'master'
   only_if: $CIRRUS_RELEASE != ''
   env:
@@ -135,12 +125,7 @@ relese_freebsd_amd64_task:
 
   prepare_script:
     - mkdir -p /usr/local/etc/pkg/repos
-    - cp /etc/pkg/FreeBSD.conf /usr/local/etc/pkg/repos
-    - > 
-      sed -i 's/FreeBSD:/FreeBSDlatest:/g'
-    - sed -i 's/quarterly/latest/g'
-    - > 
-      echo "FreeBSD: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf
+    - cp ./FreeBSD.conf /usr/local/etc/pkg/repos/
     - pkg update
     - pkg upgrade -y
     - pkg install -y curl rust pkgconf openssl bash
@@ -161,16 +146,14 @@ relese_freebsd_amd64_task:
     - files_to_upload=($(ls | grep hctl)); . ./upload.sh
 
 relese_macosx_silicon_task:
-  cpu: 8
-  memory: 6G
   only_if: $CIRRUS_BRANCH == 'master'
   only_if: $CIRRUS_RELEASE != ''
 
   env:
     GITHUB_TOKEN: ENCRYPTED[c55719815e6b9431df4596dc746645ece3acbd2917ffa29c71a1636d232aa77b7a3684b31667de46f028ca594d7a4b20]
 
   macos_instance:
-    image: ghcr.io/cirruslabs/macos-sonoma-vanilla:latest
+    image: ghcr.io/cirruslabs/macos-ventura-base:latest
 
   prepare_script:
     - NONINTERACTIVE=1 brew install pkg-config make curl rust openssl@3

diff --git a/.github/workflows/release_macosx_amd64.yml b/.github/workflows/release_macosx_amd64.yml
@@ -12,11 +12,12 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Compile
-      run: | 
+      run: |
+          brew install coreutils
           cargo build --release
           cd target/release
           mv hctl hctl-macosx-amd64
-          /usr/local/bin/gsha256sum hctl-macosx-amd64 > sha256-hctl-macosx-amd64
+          sha256sum hctl-macosx-amd64 > sha256-hctl-macosx-amd64
           
     - name: Upload binaries to release
       uses: svenstaro/upload-release-action@v2

diff --git a/FreeBSD.conf b/FreeBSD.conf
@@ -0,0 +1,9 @@
+FreeBSD: { enabled: no }
+
+FreeBSDABIlatest: {
+  url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest",
+  mirror_type: "srv",
+  signature_type: "fingerprints",
+  fingerprints: "/usr/share/keys/pkg",
+  enabled: yes
+}
diff --git a/README.md b/README.md
@@ -14,9 +14,9 @@
 
 ## CI/CD
 
-[![Build Status](https://api.cirrus-ci.com/github/michalszmidt/hctl.svg)](https://cirrus-ci.com/github/michalszmidt/hctl) *CirrusCI* (Linux musl/glib amd64/aarch64, FreeBSD amd64, MacOS X silicon)
+[![Build Status](https://api.cirrus-ci.com/github/michalszmidt/hctl.svg)](https://cirrus-ci.com/github/michalszmidt/hctl) **CirrusCI** (Linux musl/glib amd64/aarch64, FreeBSD amd64, MacOS X silicon)
 
-<img alt="GitHub Workflow Status (with event)" src="https://img.shields.io/github/actions/workflow/status/michalszmidt/hctl/release_macosx_amd64.yml"> MacOS X [amd64] *GitHub Actions* (Mac OS X amd64)
+<img alt="GitHub Workflow Status (with event)" src="https://img.shields.io/github/actions/workflow/status/michalszmidt/hctl/release_macosx_amd64.yml"> **GitHub Actions** (Mac OS X amd64)
 
 <!--
 ## CI/CD: