Revert "Actions: Move all Linux packaging into subdir (#7332)" (#7334)

This reverts commit f3ff80963a.
This commit is contained in:
Austin 2025-07-13 20:54:52 -04:00 committed by GitHub
parent f3ff80963a
commit 29cca4d621
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 31 additions and 32 deletions

View File

@ -9,11 +9,11 @@ on:
paths:
- debian/**
- "*.rpkg"
- .github/workflows/daily_packaging.yml
- .github/workflows/linux_packaging/debian_src.yml
- .github/workflows/linux_packaging/ppa.yml
- .github/workflows/linux_packaging/obs.yml
- .github/workflows/linux_packaging/copr.yml
- .github/workflows/nightly_packaging.yml
- .github/workflows/build_debian_src.yml
- .github/workflows/package_ppa.yml
- .github/workflows/package_obs.yml
- .github/workflows/hook_copr.yml
permissions:
contents: write
@ -21,7 +21,7 @@ permissions:
jobs:
docker-multiarch:
uses: ./.github/workflows/linux_packaging/docker_manifest.yml
uses: ./.github/workflows/docker_manifest.yml
with:
release_channel: daily
secrets: inherit
@ -35,21 +35,21 @@ jobs:
- noble # 24.04
- plucky # 25.04
- questing # 25.10
uses: ./.github/workflows/linux_packaging/ppa.yml
uses: ./.github/workflows/package_ppa.yml
with:
ppa_repo: ppa:meshtastic/daily
series: ${{ matrix.series }}
secrets: inherit
package-obs:
uses: ./.github/workflows/linux_packaging/obs.yml
uses: ./.github/workflows/package_obs.yml
with:
obs_project: network:Meshtastic:daily
series: unstable
secrets: inherit
hook-copr:
uses: ./.github/workflows/linux_packaging/copr.yml
uses: ./.github/workflows/hook_copr.yml
with:
copr_project: daily
secrets: inherit

View File

@ -42,7 +42,6 @@ permissions:
jobs:
docker-build:
name: docker-${{ inputs.distro }}
outputs:
digest: ${{ steps.docker_variant.outputs.digest }}
runs-on: ${{ inputs.runs-on }}

View File

@ -17,7 +17,7 @@ permissions:
jobs:
docker-debian-amd64:
uses: ./.github/workflows/linux_packaging/docker_build.yml
uses: ./.github/workflows/docker_build.yml
with:
distro: debian
platform: linux/amd64
@ -26,7 +26,7 @@ jobs:
secrets: inherit
docker-debian-arm64:
uses: ./.github/workflows/linux_packaging/docker_build.yml
uses: ./.github/workflows/docker_build.yml
with:
distro: debian
platform: linux/arm64
@ -35,7 +35,7 @@ jobs:
secrets: inherit
docker-debian-armv7:
uses: ./.github/workflows/linux_packaging/docker_build.yml
uses: ./.github/workflows/docker_build.yml
with:
distro: debian
platform: linux/arm/v7
@ -44,7 +44,7 @@ jobs:
secrets: inherit
docker-alpine-amd64:
uses: ./.github/workflows/linux_packaging/docker_build.yml
uses: ./.github/workflows/docker_build.yml
with:
distro: alpine
platform: linux/amd64
@ -53,7 +53,7 @@ jobs:
secrets: inherit
docker-alpine-arm64:
uses: ./.github/workflows/linux_packaging/docker_build.yml
uses: ./.github/workflows/docker_build.yml
with:
distro: alpine
platform: linux/arm64
@ -62,7 +62,7 @@ jobs:
secrets: inherit
docker-alpine-armv7:
uses: ./.github/workflows/linux_packaging/docker_build.yml
uses: ./.github/workflows/docker_build.yml
with:
distro: alpine
platform: linux/arm/v7

View File

@ -136,7 +136,7 @@ jobs:
build-debian-src:
if: github.repository == 'meshtastic/firmware'
uses: ./.github/workflows/linux_packaging/debian_src.yml
uses: ./.github/workflows/build_debian_src.yml
with:
series: UNRELEASED
build_location: local
@ -154,7 +154,7 @@ jobs:
uses: ./.github/workflows/test_native.yml
docker-deb-amd64:
uses: ./.github/workflows/linux_packaging/docker_build.yml
uses: ./.github/workflows/docker_build.yml
with:
distro: debian
platform: linux/amd64
@ -162,7 +162,7 @@ jobs:
push: false
docker-deb-amd64-tft:
uses: ./.github/workflows/linux_packaging/docker_build.yml
uses: ./.github/workflows/docker_build.yml
with:
distro: debian
platform: linux/amd64
@ -171,7 +171,7 @@ jobs:
pio_env: native-tft
docker-alp-amd64:
uses: ./.github/workflows/linux_packaging/docker_build.yml
uses: ./.github/workflows/docker_build.yml
with:
distro: alpine
platform: linux/amd64
@ -179,7 +179,7 @@ jobs:
push: false
docker-alp-amd64-tft:
uses: ./.github/workflows/linux_packaging/docker_build.yml
uses: ./.github/workflows/docker_build.yml
with:
distro: alpine
platform: linux/amd64
@ -188,7 +188,7 @@ jobs:
pio_env: native-tft
docker-deb-arm64:
uses: ./.github/workflows/linux_packaging/docker_build.yml
uses: ./.github/workflows/docker_build.yml
with:
distro: debian
platform: linux/arm64
@ -196,7 +196,7 @@ jobs:
push: false
docker-deb-armv7:
uses: ./.github/workflows/linux_packaging/docker_build.yml
uses: ./.github/workflows/docker_build.yml
with:
distro: debian
platform: linux/arm/v7

View File

@ -1,4 +1,4 @@
name: Trunk Nightly
name: Nightly
on:
schedule:
- cron: 0 8 * * 1-5

View File

@ -23,7 +23,7 @@ permissions:
jobs:
build-debian-src:
uses: ./.github/workflows/linux_packaging/debian_src.yml
uses: ./.github/workflows/build_debian_src.yml
secrets: inherit
with:
series: ${{ inputs.series }}

View File

@ -21,7 +21,7 @@ permissions:
jobs:
build-debian-src:
uses: ./.github/workflows/linux_packaging/debian_src.yml
uses: ./.github/workflows/build_debian_src.yml
secrets: inherit
with:
series: ${{ inputs.series }}

View File

@ -10,7 +10,7 @@ permissions:
jobs:
build-docker:
uses: ./.github/workflows/linux_packaging/docker_manifest.yml
uses: ./.github/workflows/docker_manifest.yml
with:
release_channel: |-
${{ contains(github.event.release.name, 'Beta') && 'beta' || contains(github.event.release.name, 'Alpha') && 'alpha' }}
@ -25,7 +25,7 @@ jobs:
- noble # 24.04
- plucky # 25.04
# - questing # 25.10
uses: ./.github/workflows/linux_packaging/ppa.yml
uses: ./.github/workflows/package_ppa.yml
with:
ppa_repo: |-
ppa:meshtastic/${{ contains(github.event.release.name, 'Beta') && 'beta' || contains(github.event.release.name, 'Alpha') && 'alpha' }}
@ -33,7 +33,7 @@ jobs:
secrets: inherit
package-obs:
uses: ./.github/workflows/linux_packaging/obs.yml
uses: ./.github/workflows/package_obs.yml
with:
obs_project: |-
network:Meshtastic:${{ contains(github.event.release.name, 'Beta') && 'beta' || contains(github.event.release.name, 'Alpha') && 'alpha' }}
@ -42,7 +42,7 @@ jobs:
secrets: inherit
hook-copr:
uses: ./.github/workflows/linux_packaging/copr.yml
uses: ./.github/workflows/hook_copr.yml
with:
copr_project: |-
${{ contains(github.event.release.name, 'Beta') && 'beta' || contains(github.event.release.name, 'Alpha') && 'alpha' }}

View File

@ -10,8 +10,8 @@ elif (echo $2 | grep -q "nrf52"); then
bin/build-nrf52.sh $1
elif (echo $2 | grep -q "stm32"); then
bin/build-stm32.sh $1
elif (echo $2 | grep -q "rp2xx0"); then
bin/build-rp2xx0.sh $1
elif (echo $2 | grep -q "rpi2040"); then
bin/build-rpi2040.sh $1
else
echo "Unknown target $2"
exit 1