diff --git a/.github/workflows/external.yml b/.github/workflows/external.yml index 7a14514f..0bbfbd74 100644 --- a/.github/workflows/external.yml +++ b/.github/workflows/external.yml @@ -1,9 +1,9 @@ -name: Check application download +name: Verify installation on: pull_request: types: [opened, reopened, edited, synchronize] paths: - - 'external/*' + - 'external/*.conf' workflow_dispatch: jobs: @@ -25,24 +25,7 @@ jobs: needs: Cancel if: ${{ github.repository_owner == 'Armbian' }} - uses: armbian/scripts/.github/workflows/download-external.yml@devel3 - with: - ACCESS_NAME: armbian - BUILD_RUNNER: ${{ inputs.BUILD_RUNNER }} || "ubuntu-latest" - REFERENCE: ${{ github.event.pull_request.head.sha }} - secrets: - GPG_KEY1: ${{ secrets.GPG_KEY1 }} - GPG_PASSPHRASE1: ${{ secrets.GPG_PASSPHRASE1 }} - ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }} - KEY_TORRENTS: ${{ secrets.KEY_TORRENTS }} - KNOWN_HOSTS_UPLOAD: ${{ secrets.KNOWN_HOSTS_UPLOAD }} - - repository: - name: "Generate repository" - needs: external - - if: ${{ github.repository_owner == 'Armbian' }} - uses: armbian/scripts/.github/workflows/generate-repository.yml@devel3 + uses: armbian/scripts/.github/workflows/download-and-test-external.yml@main with: ACCESS_NAME: armbian BUILD_RUNNER: ${{ inputs.BUILD_RUNNER }} || "ubuntu-latest" diff --git a/external/cockpit-file-sharing.conf b/external/cockpit-file-sharing.conf new file mode 100644 index 00000000..05704aef --- /dev/null +++ b/external/cockpit-file-sharing.conf @@ -0,0 +1,9 @@ +URL=https://github.com/45Drives/cockpit-file-sharing +KEY=jammy +RELEASE=all +TARGET=utils +METHOD=gh +INSTALL=cockpit-file-sharing +GLOB=cockpit-file-sharing +ARCH=armhf:arm64:amd64 +REPOSITORY=BS diff --git a/external/openhab.conf.disablex b/external/openhab.conf.disablex new file mode 100644 index 00000000..c0a18d80 --- /dev/null +++ b/external/openhab.conf.disablex @@ -0,0 +1,9 @@ +URL="https://openhab.jfrog.io/artifactory/openhab-linuxpkg" +KEY=stable +RELEASE=all +TARGET=utils +METHOD=aptly +INSTALL=openhab +GLOB="$Version (> 3.4.2), Name (% openhab*)" +ARCH=arm64:amd64 +REPOSITORY=B diff --git a/external/projects.csv b/external/projects.csv index afaa4baa..a0b96000 100644 --- a/external/projects.csv +++ b/external/projects.csv @@ -1,9 +1,29 @@ Project name,URL,Source component,Release,Target location,Method,Search parameter,Arhitectures,Repository -#zfs-dkms,http://ports.ubuntu.com/ubuntu-ports,lunar main restricted universe multiverse,jammy,utils,aptly,Name (% zfs-dkms),armhf:arm64,B -zfs-from-lunar-amd64,http://archive.ubuntu.com/ubuntu,lunar main restricted universe multiverse,jammy,utils,aptly,zfs-dkms,"Name (% zfsutils-linux) | Name (% libnvpair3linux) | Name (% libzfs4linux) | Name (% libzpool5linux) | Name (% libuutil3linux) | Name (% zfs-dkms)",amd64,B -zfs-from-lunar,http://ports.ubuntu.com/ubuntu-ports,lunar main restricted universe multiverse,jammy,utils,aptly,zfs-dkms,"Name (% zfsutils-linux) | Name (% libnvpair3linux) | Name (% libzfs4linux) | Name (% libzpool5linux) | Name (% libuutil3linux) | Name (% zfs-dkms)",armhf:arm64,B -#zfs-from-sid,http://deb.debian.org/debian,bullseye-backports contrib non-free,lunar,utils,aptly,"Name (% zfsutils-linux) | Name (% libnvpair3linux) | Name (% libzfs4linux) | Name (% libzpool5linux) | Name (% libuutil3linux) | Name (% zfs-dkms)",armhf:arm64:amd64,B -zulu20,https://repos.azul.com/zulu/deb,stable main,all,utils,aptly,zulu20,Name (% zulu20*),arm64:amd64,B -openhab,https://openhab.jfrog.io/artifactory/openhab-linuxpkg stable,main,all,utils,aptly,openhab,"$Version (> 3.4.2), Name (% openhab*)",arm64:amd64,B -cockpit-file-sharing,https://github.com/45Drives/cockpit-file-sharing,jammy,all,utils,gh,cockpit-file-sharing,cockpit-file-sharing,armhf:arm64:amd64,BS -pacstall,https://github.com/pacstall/pacstall,jammy,all,utils,gh,pacstall,pacstall,armhf:arm64:amd64,BS +thunderbird,http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu,jammy,jammy,desktop,aptly,Name (% thunderbird*),armhf:arm64:amd64,B +thunderbird,http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu,lunar,lunar,desktop,aptly,Name (% thunderbird*),armhf:arm64:amd64,B +firefox,http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu,jammy,jammy,desktop,aptly,Name (% firefox-*),armhf:arm64:amd64,B +firefox,http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu,lunar,lunar,desktop,aptly,Name (% firefox-*),armhf:arm64:amd64,B +google-chrome-stable,http://dl.google.com/linux/chrome/deb/ stable,main,all,utils,aptly,Name (% google-chrome-stable),amd64,BS +chromium-browser,http://ppa.launchpadcontent.net/saiarcot895/chromium-beta/ubuntu,jammy,jammy,desktop,aptly,chromium-browser,armhf:arm64:amd64,B +chromium-browser,http://ppa.launchpadcontent.net/saiarcot895/chromium-beta/ubuntu,kinetic,lunar,desktop,aptly,chromium-browser,armhf:arm64:amd64,B +box86-generic-arm,http://ryanfortner.github.io/box86-debs/debian,./,all,utils,aptly,Name (% box86*),armhf,BS +box64-generic-arm,http://ryanfortner.github.io/box64-debs/debian,./,all,utils,aptly,Name (% box64*),arm64,BS +zfsutils-linux,http://deb.debian.org/debian,bullseye-backports contrib non-free,bullseye,utils,aptly,zfsutils-linux,armhf:arm64:amd64,B +zfsutils-linux,http://deb.debian.org/debian,bullseye-backports contrib non-free,lunar,utils,aptly,zfsutils-linux,armhf:arm64:amd64,B +zfs-dkms,http://deb.debian.org/debian,bullseye-backports contrib non-free,bullseye,utils,aptly,zfs-dkms,armhf:arm64:amd64,B +zfs-dkms,http://deb.debian.org/debian,bullseye-backports contrib non-free,lunar,utils,aptly,zfs-dkms,armhf:arm64:amd64,B +nala,http://deb.volian.org/volian scar,main,jammy,utils,aptly,Name (% nala*),armhf:arm64:amd64,B +nala,http://deb.volian.org/volian scar,main,kinetic,utils,aptly,Name (% nala*),armhf:arm64:amd64,B +nala,http://deb.volian.org/volian scar,main,lunar,utils,aptly,Name (% nala*),armhf:arm64:amd64,B +aptly,https://github.com/aptly-dev/aptly,focal,all,utils,gh,amd64,armhf:arm64:amd64,B +gh,https://github.com/cli/cli,jammy,all,utils,gh,gh,armhf:arm64:amd64,BS +balena-etcher,https://github.com/balena-io/etcher,jammy,all,utils,gh,balena-etcher,armhf:arm64:amd64,BS +zoom,http://mirror.mwt.me/my/deb,any,all,desktop,aptly,zoom,amd64,B +system-monitoring-center,https://github.com/hakandundar34coding/system-monitoring-center,jammy,jammy,utils,gh,,armhf:arm64:amd64,B +system-monitoring-center,https://github.com/hakandundar34coding/system-monitoring-center,jammy,lunar,utils,gh,,armhf:arm64:amd64,B +system-monitoring-center,https://github.com/hakandundar34coding/system-monitoring-center,jammy,bullseye,utils,gh,,armhf:arm64:amd64,B +system-monitoring-center,https://github.com/hakandundar34coding/system-monitoring-center,jammy,sid,utils,gh,,armhf:arm64:amd64,B +howdy,https://ppa.launchpadcontent.net/boltgolt/howdy/ubuntu,jammy,all,desktop,aptly,,armhf:arm64:amd64,B +urbackup-server,https://ppa.launchpadcontent.net/uroni/urbackup/ubuntu,jammy,jammy,utils,aptly,,armhf:arm64:amd64,B +codium,http://paulcarroty.gitlab.io/vscodium-deb-rpm-repo/debs/ vscodium,main,all,desktop,aptly,codium,armhf:arm64:amd64,B +code,https://packages.microsoft.com/repos/code stable main,main,all,desktop,aptly,"$Version (> 1.76.2), Name (% code)",armhf:arm64:amd64,B diff --git a/external/zfs-from-lunar-amd64.conf b/external/zfs-lunar-to-jammy-amd64.conf similarity index 64% rename from external/zfs-from-lunar-amd64.conf rename to external/zfs-lunar-to-jammy-amd64.conf index 7aefdab6..3f71e8dc 100644 --- a/external/zfs-from-lunar-amd64.conf +++ b/external/zfs-lunar-to-jammy-amd64.conf @@ -1,9 +1,9 @@ -URL=http://archive.ubuntu.com/ubuntu,lunar -KEY="main restricted universe multiverse" +URL=http://archive.ubuntu.com/ubuntu +KEY="lunar main restricted universe multiverse" RELEASE=jammy TARGET=utils METHOD=aptly -INSTALL=zfs-dkms +INSTALL="zfs-dkms zfsutils-linux" GLOB="Name (% zfsutils-linux) | Name (% libnvpair3linux) | Name (% libzfs4linux) | Name (% libzpool5linux) | Name (% libuutil3linux) | Name (% zfs-dkms)" ARCH=amd64 REPOSITORY=B diff --git a/external/zfs-lunar-to-jammy.conf b/external/zfs-lunar-to-jammy.conf new file mode 100644 index 00000000..e68aa6a3 --- /dev/null +++ b/external/zfs-lunar-to-jammy.conf @@ -0,0 +1,9 @@ +URL=http://ports.ubuntu.com/ubuntu-ports +KEY="lunar main restricted universe multiverse" +RELEASE=jammy +TARGET=utils +METHOD=aptly +INSTALL="zfs-dkms zfsutils-linux" +GLOB="Name (% zfsutils-linux) | Name (% libnvpair3linux) | Name (% libzfs4linux) | Name (% libzpool5linux) | Name (% libuutil3linux) | Name (% zfs-dkms)" +ARCH=armhf:arm64 +REPOSITORY=B diff --git a/external/zulu.conf b/external/zulu.conf new file mode 100644 index 00000000..ba3bc0d3 --- /dev/null +++ b/external/zulu.conf @@ -0,0 +1,9 @@ +URL="https://repos.azul.com/zulu/deb stable" +KEY="main" +RELEASE=all +TARGET=utils +METHOD=aptly +INSTALL=zulu20 +GLOB="Name (% zulu20*)" +ARCH=arm64:amd64 +REPOSITORY=B