.github/workflows/ubuntu-matrix.yml: pre-release: release

.github/workflows/ubuntu-pre-release.yml .github/workflows/ubuntu-release.yml
RandyMcMillan · Aug 2, 2023 · dc8cac1 · dc8cac1
1 parent 2c481cd
commit dc8cac1
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 41 deletions.
diff --git a/.github/workflows/macos-matrix.yml b/.github/workflows/macos-matrix.yml
@@ -33,18 +33,8 @@ jobs:
       - uses: actions/checkout@v2
       - name: printenv
         run: |
-          brew install libtool autoconf automake 
+          brew install libtool autoconf automake cmake
           printenv
-      - name: make
+      - name: cmake . && make secp256k1 all
         run: |
-          make
-      - name: sudo make install
-        run: |
-          sudo make install
-      - name: man nostril
-        run: |
-          man nostril
-      - name: sudo -su runner nostril
-        run: |
-          #pipe handles non-zero return from nostril default help
-          sudo -su runner nostril        | echo "${PIPESTATUS[0]}"
+          cmake . && make secp256k1 all
diff --git a/.github/workflows/macos-pre-release.yml b/.github/workflows/macos-pre-release.yml
@@ -23,11 +23,11 @@ jobs:
       - uses: actions/checkout@v2
       - name: "printenv"
         run: |
-          brew install libtool autoconf automake
+          brew install libtool autoconf automake camke
           printenv
       - name: "Build pre-release"
         run: |
-          make
+          cmake . && make secp256k1 all
           mv nostril nostril-$RUNNER_OS-$RUNNER_ARCH
           shasum -a 256 nostril-$RUNNER_OS-$RUNNER_ARCH > nostril-$RUNNER_OS-$RUNNER_ARCH.sha256.txt
           mv nostril-query nostril-query-$RUNNER_OS-$RUNNER_ARCH

diff --git a/.github/workflows/macos-release.yml b/.github/workflows/macos-release.yml
@@ -23,11 +23,11 @@ jobs:
       - uses: actions/checkout@v2
       - name: "printenv"
         run: |
-          brew install libtool autoconf automake
+          brew install libtool autoconf automake cmake
           printenv
       - name: "Build release"
         run: |
-          make
+          cmake . && make secp256k1 all
           mv nostril nostril-$RUNNER_OS-$RUNNER_ARCH
           shasum -a 256 nostril-$RUNNER_OS-$RUNNER_ARCH > nostril-$RUNNER_OS-$RUNNER_ARCH.sha256.txt
           mv nostril-query nostril-query-$RUNNER_OS-$RUNNER_ARCH

diff --git a/.github/workflows/ubuntu-matrix.yml b/.github/workflows/ubuntu-matrix.yml
@@ -36,24 +36,12 @@ jobs:
           fetch-depth: '0'
           submodules: 'recursive'
           set-safe-directory: 'true'
-      - name: printenv && sudo apt update && sudo apt install scdoc -y
+      - name: printenv && sudo apt update && sudo apt install scdoc cmake -y
         run: |
-          printenv && sudo apt update && sudo apt install scdoc -y
+          printenv && sudo apt update && sudo apt install scdoc cmake -y
       - name: rm -rf deps
         run: |
           rm -rf deps
-      - name: make
+      - name: cmake .
         run: |
-          mkdir -p /usr/local/share/man/man1/nostril.1
-          make
-      - name: sudo make install
-        run: |
-          sudo make install
-      - name: man nostril
-        run: |
-          man nostril
-      - name: sudo ./nostril
-        run: |
-          #pipe handles non-zero return from nostril default help
-          file nostril
-          sudo ./nostril >/dev/null | echo "${PIPESTATUS[0]}"
+          cmake . && make secp256k1 install
diff --git a/.github/workflows/ubuntu-pre-release.yml b/.github/workflows/ubuntu-pre-release.yml
@@ -26,13 +26,12 @@ jobs:
           fetch-depth: '0'
           submodules: 'recursive'
           set-safe-directory: 'true'
-      - name: printenv && sudo apt update && sudo apt install scdoc -y
+      - name: printenv && sudo apt update && sudo apt install scdoc cmake -y
         run: |
-          printenv && sudo apt update && sudo apt install scdoc -y
+          printenv && sudo apt update && sudo apt install scdoc cmake -y
       - name: "Build pre-release"
         run: |
-          mkdir -p /usr/local/share/man/man1/nostril.1
-          make nostril
+          cmake . && make secp256k1 all
           mv nostril nostril-$RUNNER_OS-$RUNNER_ARCH
           shasum -a 256 nostril-$RUNNER_OS-$RUNNER_ARCH > nostril-$RUNNER_OS-$RUNNER_ARCH.sha256.txt
           mv nostril-query nostril-query-$RUNNER_OS-$RUNNER_ARCH

diff --git a/.github/workflows/ubuntu-release.yml b/.github/workflows/ubuntu-release.yml
@@ -26,13 +26,12 @@ jobs:
           fetch-depth: '0'
           submodules: 'recursive'
           set-safe-directory: 'true'
-      - name: printenv && sudo apt update && sudo apt install scdoc -y
+      - name: printenv && sudo apt update && sudo apt install scdoc cmake -y
         run: |
-          printenv && sudo apt update && sudo apt install scdoc -y
+          printenv && sudo apt update && sudo apt install scdoc cmake -y
       - name: "Build release"
         run: |
-          mkdir -p /usr/local/share/man/man1/nostril.1
-          make nostril
+          cmake . && make secp256k1 all
           mv nostril nostril-$RUNNER_OS-$RUNNER_ARCH
           shasum -a 256 nostril-$RUNNER_OS-$RUNNER_ARCH > nostril-$RUNNER_OS-$RUNNER_ARCH.sha256.txt
           mv nostril-query nostril-query-$RUNNER_OS-$RUNNER_ARCH