From c9c3ad6780aa1f0115eaeb0157e72391e6b6057b Mon Sep 17 00:00:00 2001 From: Alexander Barker Date: Sun, 26 Nov 2023 11:34:10 -0800 Subject: [PATCH] Updating actions to fix build process --- .github/workflows/package.yml | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index cb484bbf..3e6fc50d 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -36,7 +36,7 @@ jobs: cmake --install ${{github.workspace}}/build --config RelWithDebInfo - name: Upload - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: nightly-build path: ${{github.workspace}}/dist/**/* @@ -72,7 +72,7 @@ jobs: cmake --install ${{github.workspace}}/build --config RelWithDebInfo - name: Upload - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: nightly-build path: ${{github.workspace}}/dist/**/* @@ -95,10 +95,14 @@ jobs: deb [arch=amd64,i386] http://us.archive.ubuntu.com/ubuntu ${DISTRIB_CODENAME} main universe deb [arch=amd64,i386] http://us.archive.ubuntu.com/ubuntu ${DISTRIB_CODENAME}-updates main universe deb [arch=amd64,i386] http://us.archive.ubuntu.com/ubuntu ${DISTRIB_CODENAME}-backports main universe - + # This only seems to be required on GitHub images + deb [arch=amd64,i386] https://ppa.launchpadcontent.net/ubuntu-toolchain-r/test/ubuntu ${DISTRIB_CODENAME} main + deb [arch=arm64,armhf] http://ports.ubuntu.com/ubuntu-ports ${DISTRIB_CODENAME} main universe deb [arch=arm64,armhf] http://ports.ubuntu.com/ubuntu-ports ${DISTRIB_CODENAME}-updates main universe deb [arch=arm64,armhf] http://ports.ubuntu.com/ubuntu-ports ${DISTRIB_CODENAME}-backports main universe + # This only seems to be required on GitHub images + deb [arch=arm64,armhf] https://ppa.launchpadcontent.net/ubuntu-toolchain-r/test/ubuntu ${DISTRIB_CODENAME} main " > /etc/apt/sources.list' sudo dpkg --add-architecture armhf @@ -141,7 +145,7 @@ jobs: cmake --install ${{github.workspace}}/build --config RelWithDebInfo - name: Upload - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: nightly-build path: ${{github.workspace}}/dist/**/* @@ -158,15 +162,19 @@ jobs: - name: Setup shell: bash run: | - sudo rm -Rf /etc/apt/sources.list.d + sudo rm -Rf /etc/apt/sources.list.d/* sudo bash -c 'source /etc/lsb-release && echo " deb [arch=amd64,i386] http://us.archive.ubuntu.com/ubuntu ${DISTRIB_CODENAME} main universe deb [arch=amd64,i386] http://us.archive.ubuntu.com/ubuntu ${DISTRIB_CODENAME}-updates main universe deb [arch=amd64,i386] http://us.archive.ubuntu.com/ubuntu ${DISTRIB_CODENAME}-backports main universe + # This only seems to be required on GitHub images + deb [arch=amd64,i386] https://ppa.launchpadcontent.net/ubuntu-toolchain-r/test/ubuntu ${DISTRIB_CODENAME} main deb [arch=arm64,armhf] http://ports.ubuntu.com/ubuntu-ports ${DISTRIB_CODENAME} main universe deb [arch=arm64,armhf] http://ports.ubuntu.com/ubuntu-ports ${DISTRIB_CODENAME}-updates main universe deb [arch=arm64,armhf] http://ports.ubuntu.com/ubuntu-ports ${DISTRIB_CODENAME}-backports main universe + # This only seems to be required on GitHub images + deb [arch=arm64,armhf] https://ppa.launchpadcontent.net/ubuntu-toolchain-r/test/ubuntu ${DISTRIB_CODENAME} main " > /etc/apt/sources.list' sudo dpkg --add-architecture arm64 @@ -209,7 +217,7 @@ jobs: cmake --install ${{github.workspace}}/build --config RelWithDebInfo - name: Upload - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: nightly-build path: ${{github.workspace}}/dist/**/* @@ -231,6 +239,8 @@ jobs: deb [arch=amd64,i386] http://us.archive.ubuntu.com/ubuntu ${DISTRIB_CODENAME} main universe deb [arch=amd64,i386] http://us.archive.ubuntu.com/ubuntu ${DISTRIB_CODENAME}-updates main universe deb [arch=amd64,i386] http://us.archive.ubuntu.com/ubuntu ${DISTRIB_CODENAME}-backports main universe + # This only seems to be required on GitHub images + deb [arch=amd64,i386] https://ppa.launchpadcontent.net/ubuntu-toolchain-r/test/ubuntu ${DISTRIB_CODENAME} main " > /etc/apt/sources.list' sudo dpkg --add-architecture i386 @@ -273,7 +283,7 @@ jobs: cmake --install ${{github.workspace}}/build --config RelWithDebInfo - name: Upload - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: nightly-build path: ${{github.workspace}}/dist/**/* @@ -323,7 +333,7 @@ jobs: cmake --install ${{github.workspace}}/build --config RelWithDebInfo - name: Upload - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: nightly-build path: ${{github.workspace}}/dist/**/* @@ -360,7 +370,7 @@ jobs: cmake --install ${{github.workspace}}\build --config RelWithDebInfo - name: Upload - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: nightly-build path: ${{github.workspace}}/dist/**/* @@ -396,7 +406,7 @@ jobs: cmake --install ${{github.workspace}}\build --config RelWithDebInfo - name: Upload - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: nightly-build path: ${{github.workspace}}/dist/**/* @@ -432,7 +442,7 @@ jobs: cmake --install ${{github.workspace}}\build --config RelWithDebInfo - name: Upload - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: nightly-build path: ${{github.workspace}}/dist/**/*