Skip to content

Commit 158585e

Browse files
authored
Merge branch '2.9' into 2.9
2 parents 2b6c60e + d46595c commit 158585e

2 files changed

Lines changed: 41 additions & 0 deletions

File tree

.github/workflows/ci.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,25 @@ jobs:
125125
# our build system to determine the version from tags
126126
fetch-depth: 0
127127

128+
- name: Add linuxcnc.org deb archive
129+
env:
130+
DEBIAN_FRONTEND: noninteractive
131+
run: |
132+
case "${{matrix.image}}" in
133+
debian:sid|debian:bookworm|debian:trixie)
134+
exit 0
135+
;;
136+
*)
137+
;;
138+
esac
139+
set -e
140+
set -x
141+
eatmydata apt-get --yes --quiet install --no-install-recommends gpg software-properties-common
142+
eatmydata gpg --homedir="${PWD}/gnupg" --output /etc/apt/trusted.gpg.d/linuxcnc-deb-archive.gpg --export 3CB9FD148F374FEF
143+
DIST=$(echo ${{matrix.image}} | cut -d : -f 2)
144+
eatmydata add-apt-repository "deb http://linuxcnc.org $DIST base"
145+
eatmydata apt-get --quiet update
146+
128147
- name: Build architecture-specific Debian packages
129148
env:
130149
DEBEMAIL: emc-developers@lists.sourceforge.net
@@ -279,6 +298,27 @@ jobs:
279298
path: artifacts/${{ steps.meta.outputs.dist }}/${{ steps.meta.outputs.arch }}
280299
if-no-files-found: error
281300

301+
302+
cppcheck:
303+
runs-on: ubuntu-24.04
304+
steps:
305+
- uses: actions/checkout@v2
306+
with:
307+
submodules: true
308+
fetch-depth: 0
309+
- name: Perform Source Code checks that were successful in the past
310+
continue-on-error: true
311+
run: |
312+
set -x
313+
git fetch --recurse-submodules=no https://github.com/linuxcnc/linuxcnc refs/tags/*:refs/tags/*
314+
sudo apt-get -y install cppcheck shellcheck
315+
scripts/cppcheck.sh
316+
- name: Shellcheck
317+
continue-on-error: true
318+
run: |
319+
scripts/shellcheck.sh
320+
321+
282322
release:
283323
name: Release packages
284324
needs:

debian/changelog

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
linuxcnc (1:2.9.7) bookworm; urgency=low
22

3+
* [ci] publish releases with artifacts - GitHub now builds release debs
34
* Revert 7d9ee66 to address #3583 - halui functions stop working in 2.9.5/6
45
* Merge pull request #3512 from Sigma1912/patch-1
56
* Gmoccapy: Fix arrow key up/down bug in tooleditor

0 commit comments

Comments
 (0)