cleanup a lot of boilerplate to see if we can minimize these dependen…

…cies
shiftkey · Mar 31, 2024 · 628ffaa · 628ffaa
1 parent 9f99441
commit 628ffaa
Showing 1 changed file with 4 additions and 58 deletions.
diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
@@ -44,36 +44,18 @@ jobs:
   arm64:
     name: Ubuntu (arm64)
     runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    timeout-minutes: 60
-    env:
-      npm_config_arch: arm64
     steps:
       - uses: actions/checkout@v4
         with:
           repository: ${{ inputs.repository || github.repository }}
           ref: ${{ inputs.ref }}
           submodules: recursive
-      - uses: actions/setup-python@v5
-        if: matrix.friendlyName != 'Ubuntu'
-        with:
-          python-version: '3.11'
-      - name: Use Node.js ${{ env.NODE_VERSION }}
-        if: matrix.friendlyName != 'Ubuntu'
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-          cache: yarn
-      - name: Get app version
-        id: version
-        run: echo version=$(jq -r ".version" app/package.json) >> $GITHUB_OUTPUT
       - name: Package and test application in container
-        uses: shiftkey/desktop-ubuntu-amd64-packaging@main
+        uses: shiftkey/desktop-ubuntu-arm64-packaging@main
       - name: Upload output artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: Ubuntu-arm64-artifacts
+          name: ubuntu-arm64-artifacts
           path: |
             dist/*.AppImage
             dist/*.deb
@@ -83,36 +65,18 @@ jobs:
   arm:
     name: Ubuntu (arm)
     runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    timeout-minutes: 60
-    env:
-      npm_config_arch: arm
     steps:
       - uses: actions/checkout@v4
         with:
           repository: ${{ inputs.repository || github.repository }}
           ref: ${{ inputs.ref }}
           submodules: recursive
-      - uses: actions/setup-python@v5
-        if: matrix.friendlyName != 'Ubuntu'
-        with:
-          python-version: '3.11'
-      - name: Use Node.js ${{ env.NODE_VERSION }}
-        if: matrix.friendlyName != 'Ubuntu'
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-          cache: yarn
-      - name: Get app version
-        id: version
-        run: echo version=$(jq -r ".version" app/package.json) >> $GITHUB_OUTPUT
       - name: Package and test application in container
         uses: shiftkey/desktop-ubuntu-arm-packaging@main
       - name: Upload output artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: Ubuntu-arm-artifacts
+          name: ubuntu-arm-artifacts
           path: |
             dist/*.AppImage
             dist/*.deb
@@ -122,36 +86,18 @@ jobs:
   amd64:
     name: Ubuntu (amd64)
     runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    timeout-minutes: 60
-    env:
-      npm_config_arch: x64
     steps:
       - uses: actions/checkout@v4
         with:
           repository: ${{ inputs.repository || github.repository }}
           ref: ${{ inputs.ref }}
           submodules: recursive
-      - uses: actions/setup-python@v5
-        if: matrix.friendlyName != 'Ubuntu'
-        with:
-          python-version: '3.11'
-      - name: Use Node.js ${{ env.NODE_VERSION }}
-        if: matrix.friendlyName != 'Ubuntu'
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-          cache: yarn
-      - name: Get app version
-        id: version
-        run: echo version=$(jq -r ".version" app/package.json) >> $GITHUB_OUTPUT
       - name: Package and test application in container
         uses: shiftkey/desktop-ubuntu-amd64-packaging@main
       - name: Upload output artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: Ubuntu-amd64-artifacts
+          name: ubuntu-amd64-artifacts
           path: |
             dist/*.AppImage
             dist/*.deb