diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 52203a4f..a07b9cb1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -174,80 +174,7 @@ jobs: run: ./deploy/build_containers.sh shell: bash - build-test-commit-debs: - needs: [test-in-docker-container] - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - submodules: recursive - fetch-depth: 0 - - - name: Check if tagged - id: check_if_tagged - run: | - otag=$(git tag --points-at HEAD) - echo "Tag is ${otag}" - if [ -z "$otag" ] - then - hastag=0 - else - hastag=1 - fi - echo "hastag=$hastag" >> $GITHUB_OUTPUT - - - name: Update submodules - run: | - git submodule update --init - git pull --recurse-submodules - git submodule update --remote --recursive - shell: bash - - - name: Install Dependencies - run: ./deploy/dependencies/install_dependencies_ubuntu.sh - shell: bash - - - name: Build deb darkdetect - run: ./deploy/build_packages/build_deb_darkdetect.sh - shell: bash - - - name: Build pkgs LenovoLegionLinux - run: | - ./deploy/build_packages/build_deb_LLL.sh - shell: bash - - - name: Import GPG key - uses: crazy-max/ghaction-import-gpg@v5 - with: - gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} - - - name: Copy and Generate files - Ubuntu - run: | - cd package_repo/ubuntu - gpg --armor --export "${{ secrets.GPG_ID }}" > ./KEY.gpg - dpkg-scanpackages --multiversion . > Packages - gzip -k -f Packages - apt-ftparchive release . > Release - gpg --default-key "${{ secrets.GPG_ID }}" -abs -o - Release > Release.gpg - gpg --default-key "${{ secrets.GPG_ID }}" --clearsign -o - Release > InRelease - echo "deb [signed-by=/usr/share/keyrings/lll-ppa.gpg] https://johnfanv2.github.io/LenovoLegionLinux/package_repo/ubuntu ./" > lll-ppa.list - shell: bash - - - name: Commit changes - if: steps.check_if_tagged.outputs.hastag == 1 - run: | - git fetch - git add -A - git config user.name github-actions - git config user.email github-actions@github.com - git commit -m "Add new debs" - git pull --rebase - git push - shell: bash - test-packages: - needs: [build-test-commit-debs] runs-on: ubuntu-latest steps: - name: Checkout diff --git a/deploy/package_testing/Dockerfile.ubuntu b/deploy/package_testing/Dockerfile.ubuntu index 1b690f9f..ec5add0e 100644 --- a/deploy/package_testing/Dockerfile.ubuntu +++ b/deploy/package_testing/Dockerfile.ubuntu @@ -23,5 +23,5 @@ RUN ./deploy/dependencies/install_test_dependencies_ubuntu.sh # Test: Maybe refactor to run outside of Dockerfile COPY deploy deploy COPY tests tests -RUN ./deploy/package_testing/download_install_deb_ppa.sh +RUN ./deploy/package_testing/download_install_debian.sh #RUN ./tests/test_python_installed.sh diff --git a/deploy/package_testing/download_install_deb_ppa.sh b/deploy/package_testing/download_install_deb_ppa.sh deleted file mode 100755 index 842c3dc1..00000000 --- a/deploy/package_testing/download_install_deb_ppa.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -sudo apt-get install -y curl gpg -sudo curl -s https://MrDuartePT.github.io/LLL-pkg-repo/ubuntu/KEY.gpg | gpg --dearmor | sudo tee /usr/share/keyrings/lll-ppa.gpg > /dev/null -sudo curl -SsL -o /etc/apt/sources.list.d/lll-ppa.list https://MrDuartePT.github.io/LLL-pkg-repo/ubuntu/lll-ppa.list -sudo apt update -sudo apt install -y lenovolegionlinux-dkms python3-legion-linux \ No newline at end of file diff --git a/deploy/package_testing/download_install_debian.sh b/deploy/package_testing/download_install_debian.sh new file mode 100755 index 00000000..a155ba09 --- /dev/null +++ b/deploy/package_testing/download_install_debian.sh @@ -0,0 +1,8 @@ +sudo curl https://ftp.de.debian.org/debian/pool/contrib/l/lenovolegionlinux/lenovolegionlinux-dkms_0.0.10+ds-2_amd64.deb -o /tmp/lenovolegionlinux-dkms_0.0.10+ds-2_amd64.deb +sudo curl https://ftp.de.debian.org/debian/pool/contrib/l/lenovolegionlinux/python3-legion-linux_0.0.10+ds-2_all.deb -o /tmp/python3-legion-linux_0.0.10+ds-2_all.deb +sudo curl https://ftp.de.debian.org/debian/pool/contrib/l/lenovolegionlinux/lenovolegionlinux-dkms_0.0.10+ds-2_amd64.deb -o /tmp/legiond_0.0.10+ds-2_amd64.deb + +sudo apt install /tmp/lenovolegionlinux-dkms_0.0.10+ds-2_amd64.deb +sudo apt install /tmp/python3-legion-linux_0.0.10+ds-2_all.deb +sudo apt install /tmp/legiond_0.0.10+ds-2_amd64.deb +