github: add old Linux build to nightly/deploy for older glibc (#477)

Since we're moving all 16.04 ubuntu builds to 18.04, I thought this would be a good idea in case anyone needed it.

Not sure if we should have just made ALL Linux builds use the older Linux container... for now I'll just make one extra build.

2 files changed, 35 insertions, 9 deletions

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index 709d684f..f9fc21ff 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -63,6 +63,7 @@ jobs:
     name: build-release
     needs: [create-github-release]
     runs-on: ${{ matrix.triple.os }}
+    container: ${{ matrix.triple.container }}
     env:
       RUST_BACKTRACE: 1
     strategy:
@@ -77,6 +78,13 @@ jobs:
             }
           - {
               os: "ubuntu-18.04",
+              target: "x86_64-unknown-linux-gnu",
+              cross: false,
+              container: quay.io/pypa/manylinux2014_x86_64,
+              suffix: "2-17",
+            }
+          - {
+              os: "ubuntu-18.04",
               target: "i686-unknown-linux-gnu",
               cross: true,
             }
@@ -213,8 +221,8 @@ jobs:
         shell: bash
         run: |
           cp target/${{ matrix.triple.target }}/release/btm ./btm
-          tar -czvf bottom_${{ matrix.triple.target }}.tar.gz btm completion
-          echo "ASSET=bottom_${{ matrix.triple.target }}.tar.gz" >> $GITHUB_ENV
+          tar -czvf bottom_${{ matrix.triple.target }}${{ matrix.triple.suffix }}.tar.gz btm completion
+          echo "ASSET=bottom_${{ matrix.triple.target }}${{ matrix.triple.suffix }}.tar.gz" >> $GITHUB_ENV
 
       - name: Upload main release
         uses: actions/upload-release-asset@v1.0.1
@@ -273,14 +281,14 @@ jobs:
           asset_content_type: application/octet-stream
 
       - name: Build Debian release (Linux x86-64 GNU)
-        if: matrix.triple.target == 'x86_64-unknown-linux-gnu'
+        if: matrix.triple.target == 'x86_64-unknown-linux-gnu' && matrix.triple.container == ''
         run: |
           cargo install cargo-deb --version 1.29.0
           cargo deb
           cp ./target/debian/bottom_*.deb ./bottom_${{ env.RELEASE_VERSION }}_amd64.deb
 
       - name: Upload Debian file (Linux x86-64 GNU)
-        if: matrix.triple.target == 'x86_64-unknown-linux-gnu'
+        if: matrix.triple.target == 'x86_64-unknown-linux-gnu' && matrix.triple.container == ''
         uses: actions/upload-release-asset@v1.0.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index cef77aaf..541178b0 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -7,6 +7,10 @@ on:
   schedule:
     - cron: "0 0 * * *"
   workflow_dispatch:
+    inputs:
+      isMock:
+        description: "Mock nightly run, defaults to 'false'"
+        default: "false"
 
 jobs:
   create-github-release:
@@ -16,8 +20,12 @@ jobs:
       - name: Create artifacts directory
         run: mkdir artifacts
 
+      - name: Check if mock
+        run: echo "github.event.inputs.isMock"
+
       - name: Delete tag and release
         uses: dev-drprasad/delete-tag-and-release@v0.1.3
+        if: github.event.inputs.isMock == 'false'
         with:
           delete_release: true
           tag_name: nightly
@@ -30,6 +38,7 @@ jobs:
       - name: Create nightly GitHub release
         id: release
         uses: actions/create-release@v1
+        if: github.event.inputs.isMock == 'false'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -54,6 +63,7 @@ jobs:
     name: build-release
     needs: [create-github-release]
     runs-on: ${{ matrix.triple.os }}
+    container: ${{ matrix.triple.container }}
     env:
       RUST_BACKTRACE: 1
     strategy:
@@ -68,6 +78,13 @@ jobs:
             }
           - {
               os: "ubuntu-18.04",
+              target: "x86_64-unknown-linux-gnu",
+              cross: false,
+              container: quay.io/pypa/manylinux2014_x86_64,
+              suffix: "2-17",
+            }
+          - {
+              os: "ubuntu-18.04",
               target: "i686-unknown-linux-gnu",
               cross: true,
             }
@@ -199,12 +216,13 @@ jobs:
         shell: bash
         run: |
           cp target/${{ matrix.triple.target }}/release/btm ./btm
-          tar -czvf bottom_${{ matrix.triple.target }}.tar.gz btm completion
-          echo "ASSET=bottom_${{ matrix.triple.target }}.tar.gz" >> $GITHUB_ENV
+          tar -czvf bottom_${{ matrix.triple.target }}${{ matrix.triple.suffix }}.tar.gz btm completion
+          echo "ASSET=bottom_${{ matrix.triple.target }}${{ matrix.triple.suffix }}.tar.gz" >> $GITHUB_ENV
 
       # TODO: Move this elsewhere; do this all at once, and do not continue if any fails.  Store artifacts.  Do the same for deployment.
 
       - name: Upload main release
+        if: github.event.inputs.isMock == 'false'
         uses: actions/upload-release-asset@v1.0.1
         id: upload
         env:
@@ -224,7 +242,7 @@ jobs:
           cargo wix
 
       - name: Upload msi file (Windows x86-64 MSVC)
-        if: matrix.triple.target == 'x86_64-pc-windows-msvc'
+        if: matrix.triple.target == 'x86_64-pc-windows-msvc' && github.event.inputs.isMock == 'false'
         uses: actions/upload-release-asset@v1.0.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -235,14 +253,14 @@ jobs:
           asset_content_type: application/octet-stream
 
       - name: Build Debian release (Linux x86-64 GNU)
-        if: matrix.triple.target == 'x86_64-unknown-linux-gnu'
+        if: matrix.triple.target == 'x86_64-unknown-linux-gnu' && matrix.triple.container == ''
         run: |
           cargo install cargo-deb --version 1.29.0
           cargo deb
           cp ./target/debian/bottom_*.deb ./bottom_${{ env.RELEASE_VERSION }}_amd64.deb
 
       - name: Upload Debian file (Linux x86-64 GNU)
-        if: matrix.triple.target == 'x86_64-unknown-linux-gnu'
+        if: matrix.triple.target == 'x86_64-unknown-linux-gnu' && matrix.triple.container == '' && github.event.inputs.isMock == 'false'
         uses: actions/upload-release-asset@v1.0.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}