Skip to content

Commit ec0afde

Browse files
authored
Merge pull request #1221 from c-po/salt-removal
salt: T8973: remove package build due to feature removal
2 parents 705aa42 + c598a12 commit ec0afde

7 files changed

Lines changed: 0 additions & 114 deletions

File tree

.github/workflows/trigger_rebuild_packages.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,6 @@ jobs:
8282
- 'scripts/package-build/pyhumps/**'
8383
radvd:
8484
- 'scripts/package-build/radvd/**'
85-
salt:
86-
- 'scripts/package-build/salt/**'
8785
strongswan:
8886
- 'scripts/package-build/strongswan/**'
8987
tacacs:
@@ -237,10 +235,6 @@ jobs:
237235
trigger_build "radvd"
238236
fi
239237
240-
if [ "${{ steps.changes.outputs.salt }}" == "true" ]; then
241-
trigger_build "salt"
242-
fi
243-
244238
if [ "${{ steps.changes.outputs.strongswan }}" == "true" ]; then
245239
trigger_build "strongswan"
246240
fi

data/architectures/armhf.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,2 @@
1-
additional_repositories = [
2-
"deb [arch=armhf] https://packages.vyos.net/saltproject/debian/11/arm64/3005 bullseye main"
3-
]
4-
51
# Packages included in armhf images by default
62
packages = ["grub-efi-arm"]

data/live-build-config/hooks/live/18-enable-disable_services.chroot

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ systemctl disable 'udp-broadcast-relay@*.service'
2020
systemctl disable pdns-recursor.service
2121
systemctl disable tftpd-hpa.service
2222
systemctl disable frr.service
23-
systemctl disable salt-minion.service
2423
systemctl disable certbot.service
2524
systemctl disable certbot.timer
2625
systemctl disable nginx.service

scripts/package-build/salt/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

scripts/package-build/salt/build.py

Lines changed: 0 additions & 1 deletion
This file was deleted.

scripts/package-build/salt/build.sh

Lines changed: 0 additions & 76 deletions
This file was deleted.

scripts/package-build/salt/package.toml

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)