change glibc linux to archlinux

michalszmidt · Dec 31, 2024 · 668417e · 668417e
1 parent 3000c22
commit 668417e
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 64 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -6,18 +6,15 @@ task:
     GITHUB_TOKEN: ENCRYPTED[c55719815e6b9431df4596dc746645ece3acbd2917ffa29c71a1636d232aa77b7a3684b31667de46f028ca594d7a4b20]
     CARGO_TERM_COLOR: always
   arm_container:
-    image: fedora:latest
+    image: archlinux:base-devel
   prepare_script:
     - whoami
-    - dnf check-update -q && dnf up -q -y
-    - dnf group install -y "C Development Tools and Libraries" "Development Tools"
-    - dnf in -y curl openssl-devel
-    - curl https://sh.rustup.rs -sSf | bash -s -- -y
-    - . $HOME/.cargo/env
+    - pacman -Suuy --noconfirm
+    - pacman -Su openssl rustup curl --noconfirm
+    - rustup default stable
     - cargo install cargo-auditable cargo-audit
   build_script:
     - whoami
-    - . $HOME/.cargo/env
     - ls -lah
     - rustc --version
     - cargo auditable build --release --locked
@@ -32,7 +29,7 @@ task:
     - whoami
     - ls -lah
     - files_to_upload=($(ls | grep hctl)); . ./upload.sh
-      
+
 task:
   name: LinuxMuslAarch64
   only_if: $CIRRUS_BRANCH == 'master'
@@ -44,7 +41,8 @@ task:
     image: alpine:edge
   prepare_script:
     - apk -U upgrade
-    - apk add curl make pkgconf bash build-base openssl openssl-dev openssl-libs-static rust cargo
+    - apk add curl make pkgconf bash build-base openssl openssl-dev openssl-libs-static rustup
+    - rustup default stable
     - cargo install cargo-auditable cargo-audit
   build_script:
     - whoami
@@ -62,7 +60,7 @@ task:
     - whoami
     - ls -lah
     - files_to_upload=($(ls | grep hctl)); . ./upload.sh
-    
+
 task:
   name: MacosxSilicon
   only_if: $CIRRUS_BRANCH == 'master'
@@ -97,4 +95,3 @@ task:
     - whoami
     - ls -lah
     - files_to_upload=($(ls | grep hctl)); . ./upload.sh
-
diff --git a/.github/workflows/release_dragonflybsd_amd64.yml b/.github/workflows/release_dragonflybsd_amd64.yml
@@ -1,10 +1,10 @@
 name: Release for DragonflyBSD amd64
 
-# on: workflow_dispatch
-on:
-  push:
-    tags:
-      - "*"
+on: workflow_dispatch
+# on:
+#   push:
+#     tags:
+#       - "*"
 
 env:
   CARGO_TERM_COLOR: always

diff --git a/.github/workflows/release_linux_glibc_amd64.yml b/.github/workflows/release_linux_glibc_amd64.yml
@@ -3,44 +3,43 @@ name: Release for Linux glibc amd64
 on:
   push:
     tags:
-      - '*'
-      
+      - "*"
+
 env:
   CARGO_TERM_COLOR: always
 
 jobs:
   publish_for_linux_glibc_amd64:
     name: Release for Linux glibc amd64
     runs-on: ubuntu-latest
-    container: fedora:latest
+    container: archlinux:base-devel
     steps:
-    - uses: actions/checkout@v4
-    - name: Compile
-      run: |
+      - uses: actions/checkout@v4
+      - name: Compile
+        run: |
           whoami
-          dnf group install -y "C Development Tools and Libraries" "Development Tools"
-          dnf in -y curl openssl-devel
-          curl https://sh.rustup.rs -sSf | bash -s -- -y
-          . $HOME/.cargo/env
+          pacman -Suuy --noconfirm
+          pacman -Su openssl rustup curl --noconfirm
+          rustup default stable
           cargo install cargo-auditable cargo-audit
           uname -a
           rustc --version
           cargo auditable build --release --locked
           cd target/release
           mv hctl hctl-linux-glibc-amd64
           sha256sum hctl-linux-glibc-amd64 > sha256-hctl-linux-glibc-amd64
-          
-    - name: Upload binaries to release
-      uses: svenstaro/upload-release-action@v2
-      with:
-        repo_token: ${{ secrets.GITHUB_TOKEN }}
-        file: target/release/hctl-linux-glibc-amd64 
-        asset_name: hctl-linux-glibc-amd64 
-        tag: ${{ github.ref }}
-    - name: Upload checksum to release
-      uses: svenstaro/upload-release-action@v2
-      with:
-        repo_token: ${{ secrets.GITHUB_TOKEN }}
-        file: target/release/sha256-hctl-linux-glibc-amd64
-        asset_name: sha256-hctl-linux-glibc-amd64
-        tag: ${{ github.ref }}
+
+      - name: Upload binaries to release
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: target/release/hctl-linux-glibc-amd64
+          asset_name: hctl-linux-glibc-amd64
+          tag: ${{ github.ref }}
+      - name: Upload checksum to release
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: target/release/sha256-hctl-linux-glibc-amd64
+          asset_name: sha256-hctl-linux-glibc-amd64
+          tag: ${{ github.ref }}
diff --git a/.github/workflows/release_linux_musl_amd64.yml b/.github/workflows/release_linux_musl_amd64.yml
@@ -3,8 +3,8 @@ name: Release for Linux musl amd64
 on:
   push:
     tags:
-      - '*'
-      
+      - "*"
+
 env:
   CARGO_TERM_COLOR: always
 
@@ -14,32 +14,31 @@ jobs:
     runs-on: ubuntu-latest
     container: alpine:edge
     steps:
-    - uses: actions/checkout@v4
-    - name: Compile
-      run: |
+      - uses: actions/checkout@v4
+      - name: Compile
+        run: |
           whoami
-          apk add curl make pkgconf bash build-base openssl openssl-dev openssl-libs-static
-          curl https://sh.rustup.rs -sSf | bash -s -- -y
-          . $HOME/.cargo/env
+          apk add curl make pkgconf bash build-base openssl openssl-dev openssl-libs-static rustup
+          rustup default stable
           cargo install cargo-auditable cargo-audit
           uname -a
           rustc --version
           cargo auditable build --release --locked
           cd target/release
           mv hctl hctl-linux-musl-amd64
           sha256sum hctl-linux-musl-amd64 > sha256-hctl-linux-musl-amd64
-          
-    - name: Upload binaries to release
-      uses: svenstaro/upload-release-action@v2
-      with:
-        repo_token: ${{ secrets.GITHUB_TOKEN }}
-        file: target/release/hctl-linux-musl-amd64
-        asset_name: hctl-linux-musl-amd64
-        tag: ${{ github.ref }}
-    - name: Upload checksum to release
-      uses: svenstaro/upload-release-action@v2
-      with:
-        repo_token: ${{ secrets.GITHUB_TOKEN }}
-        file: target/release/sha256-hctl-linux-musl-amd64
-        asset_name: sha256-hctl-linux-musl-amd64
-        tag: ${{ github.ref }}
+
+      - name: Upload binaries to release
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: target/release/hctl-linux-musl-amd64
+          asset_name: hctl-linux-musl-amd64
+          tag: ${{ github.ref }}
+      - name: Upload checksum to release
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: target/release/sha256-hctl-linux-musl-amd64
+          asset_name: sha256-hctl-linux-musl-amd64
+          tag: ${{ github.ref }}