diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f24d4ed7f4c..6d2f0a15dda 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,6 +13,10 @@ on: permissions: contents: read # to fetch code (actions/checkout) +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: ${{ github.event_name == 'pull_request' }} + env: DEBIAN_FRONTEND: noninteractive @@ -161,6 +165,17 @@ jobs: run: | #*.po and documentation.pot are modifyed by build. Ignore them for now. .github/scripts/verify-clean-repo.sh ':(exclude)docs/po/*.po' ':(exclude)docs/po/documentation.pot' + - name: Tar linuxcnc-doc + run: | + set -x + tar -czf linuxcnc-doc.tar.gz -C docs html + - name: Upload linuxcnc-doc artifact + uses: actions/upload-artifact@v7 + with: + name: linuxcnc-doc + archive: false + path: linuxcnc-doc.tar.gz + if-no-files-found: error package-arch: runs-on: ${{ matrix.runner }} @@ -168,16 +183,27 @@ jobs: matrix: runner: ["ubuntu-24.04", "ubuntu-24.04-arm"] image: ["debian:bullseye", "debian:bookworm", "debian:trixie", "debian:sid"] + include: + - allow_fail: False + image: debian:bullseye + - allow_fail: False + image: debian:bookworm + - allow_fail: False + image: debian:trixie + - allow_fail: True + image: debian:sid container: image: ${{ matrix.image }} # IPC_OWNER is needed for shmget IPC_CREAT # SYS_ADMIN is needed for shmctl IPC_SET options: --cap-add=IPC_OWNER --cap-add=SYS_ADMIN + continue-on-error: ${{ matrix.allow_fail }} steps: - name: Dump GitHub context env: GITHUB_CONTEXT: ${{ toJson(github) }} run: | + echo Allow failure: ${{ matrix.allow_fail }} echo Number of CPUs: $(nproc) echo "$GITHUB_CONTEXT" - name: Install pre-dependencies @@ -251,16 +277,27 @@ jobs: strategy: matrix: image: ["debian:bullseye", "debian:bookworm", "debian:trixie", "debian:sid"] + include: + - allow_fail: False + image: debian:bullseye + - allow_fail: False + image: debian:bookworm + - allow_fail: False + image: debian:trixie + - allow_fail: True + image: debian:sid container: image: ${{ matrix.image }} # IPC_OWNER is needed for shmget IPC_CREAT # SYS_ADMIN is needed for shmctl IPC_SET options: --cap-add=IPC_OWNER --cap-add=SYS_ADMIN + continue-on-error: ${{ matrix.allow_fail }} steps: - name: Dump GitHub context env: GITHUB_CONTEXT: ${{ toJson(github) }} run: | + echo Allow failure: ${{ matrix.allow_fail }} echo Number of CPUs: $(nproc) echo "$GITHUB_CONTEXT" - name: Install pre-dependencies diff --git a/configs/sim/woodpecker/tool_icons/ball_end_mill.png b/configs/sim/woodpecker/tool_icons/ball_end_mill.png old mode 100755 new mode 100644 diff --git a/configs/sim/woodpecker/tool_icons/ballend_straight.png b/configs/sim/woodpecker/tool_icons/ballend_straight.png old mode 100755 new mode 100644 diff --git a/configs/sim/woodpecker/tool_icons/center_drill.png b/configs/sim/woodpecker/tool_icons/center_drill.png old mode 100755 new mode 100644 diff --git a/configs/sim/woodpecker/tool_icons/drill.png b/configs/sim/woodpecker/tool_icons/drill.png old mode 100755 new mode 100644 diff --git a/configs/sim/woodpecker/tool_icons/gauge.png b/configs/sim/woodpecker/tool_icons/gauge.png old mode 100755 new mode 100644 diff --git a/configs/sim/woodpecker/tool_icons/not_found.png b/configs/sim/woodpecker/tool_icons/not_found.png old mode 100755 new mode 100644 diff --git a/configs/sim/woodpecker/tool_icons/probe.png b/configs/sim/woodpecker/tool_icons/probe.png old mode 100755 new mode 100644 diff --git a/configs/sim/woodpecker/tool_icons/spiral_ball_end.png b/configs/sim/woodpecker/tool_icons/spiral_ball_end.png old mode 100755 new mode 100644 diff --git a/configs/sim/woodpecker/tool_icons/spiral_downcut_2F.png b/configs/sim/woodpecker/tool_icons/spiral_downcut_2F.png old mode 100755 new mode 100644 diff --git a/configs/sim/woodpecker/tool_icons/spiral_upcut.png b/configs/sim/woodpecker/tool_icons/spiral_upcut.png old mode 100755 new mode 100644 diff --git a/configs/sim/woodpecker/tool_icons/surfacing.png b/configs/sim/woodpecker/tool_icons/surfacing.png old mode 100755 new mode 100644 diff --git a/configs/sim/woodpecker/tool_icons/tapered_ball_end.png b/configs/sim/woodpecker/tool_icons/tapered_ball_end.png old mode 100755 new mode 100644 diff --git a/configs/sim/woodpecker/tool_icons/upcut_spiral.png b/configs/sim/woodpecker/tool_icons/upcut_spiral.png old mode 100755 new mode 100644 diff --git a/configs/sim/woodpecker/tool_icons/vbit-60.png b/configs/sim/woodpecker/tool_icons/vbit-60.png old mode 100755 new mode 100644 diff --git a/configs/sim/woodpecker/tool_icons/vbit-90.png b/configs/sim/woodpecker/tool_icons/vbit-90.png old mode 100755 new mode 100644 diff --git a/configs/sim/woodpecker/tool_icons/vbit-90deg.png b/configs/sim/woodpecker/tool_icons/vbit-90deg.png old mode 100755 new mode 100644 diff --git a/docs/src/Submakefile b/docs/src/Submakefile index 9dd06732ecf..a906742b4a4 100644 --- a/docs/src/Submakefile +++ b/docs/src/Submakefile @@ -518,6 +518,8 @@ $(DOC_DIR)/html/%/index.html: $(DOC_SRCDIR)/index_%.tmpl ../VERSION $(DOC_SRCDIR cat $(filter-out ../VERSION, $^) | \ sed "s/@VERSION@/`cat ../VERSION`/" | \ if [ "yes" != "$(BUILD_DOCS_TRANSLATED)" ]; then sed '/@TRANSLATIONS@/,/@ENDTRANSLATIONS@/d' ; else grep -Ev '@(END)?TRANSLATIONS@'; fi > $@ + cp -f $(DOC_DIR)/html/index.css $(DOC_DIR)/html/linuxcnc-logo-chips.png \ + $(DOC_DIR)/html/plus.png $(DOC_DIR)/html/minus.png $(dir $@) $(DOC_DIR)/html/index.html: $(DOC_SRCDIR)/index.tmpl objects/index.incl $(DOC_SRCDIR)/index.foot ../VERSION $(DOC_SRCDIR)/Submakefile (cat $(DOC_SRCDIR)/index.tmpl objects/index.incl $(DOC_SRCDIR)/index.foot) | sed "s/@VERSION@/`cat ../VERSION`/" | \ diff --git a/docs/src/getting-started/images/upgrading-to-2.9.png b/docs/src/getting-started/images/upgrading-to-2.9.png old mode 100755 new mode 100644 diff --git a/docs/src/gui/images/gremlin_extents_non-rotated.png b/docs/src/gui/images/gremlin_extents_non-rotated.png old mode 100755 new mode 100644 diff --git a/docs/src/gui/images/gremlin_extents_rotated_30.png b/docs/src/gui/images/gremlin_extents_rotated_30.png old mode 100755 new mode 100644 diff --git a/lib/python/qtvcp/lib/auto_height/images/auto_height.png b/lib/python/qtvcp/lib/auto_height/images/auto_height.png old mode 100755 new mode 100644 diff --git a/share/qtvcp/screens/qtdragon_hd/images/tool_icons/ball_end_mill.png b/share/qtvcp/screens/qtdragon_hd/images/tool_icons/ball_end_mill.png old mode 100755 new mode 100644 diff --git a/share/qtvcp/screens/qtdragon_hd/images/tool_icons/center_drill.png b/share/qtvcp/screens/qtdragon_hd/images/tool_icons/center_drill.png old mode 100755 new mode 100644 diff --git a/share/qtvcp/screens/qtdragon_hd/images/tool_icons/drill.png b/share/qtvcp/screens/qtdragon_hd/images/tool_icons/drill.png old mode 100755 new mode 100644 diff --git a/share/qtvcp/screens/qtdragon_hd/images/tool_icons/not_found.png b/share/qtvcp/screens/qtdragon_hd/images/tool_icons/not_found.png old mode 100755 new mode 100644 diff --git a/share/qtvcp/screens/qtdragon_hd/images/tool_icons/probe.png b/share/qtvcp/screens/qtdragon_hd/images/tool_icons/probe.png old mode 100755 new mode 100644 diff --git a/share/qtvcp/screens/qtdragon_hd/images/tool_icons/surfacing.png b/share/qtvcp/screens/qtdragon_hd/images/tool_icons/surfacing.png old mode 100755 new mode 100644 diff --git a/share/qtvcp/screens/qtdragon_hd/images/tool_icons/upcut_spiral.png b/share/qtvcp/screens/qtdragon_hd/images/tool_icons/upcut_spiral.png old mode 100755 new mode 100644 diff --git a/share/qtvcp/screens/qtdragon_hd/images/tool_icons/vbit-90deg.png b/share/qtvcp/screens/qtdragon_hd/images/tool_icons/vbit-90deg.png old mode 100755 new mode 100644 diff --git a/share/qtvcp/screens/qtdragon_hd_vert/images/tool_icons/ball_end_mill.png b/share/qtvcp/screens/qtdragon_hd_vert/images/tool_icons/ball_end_mill.png old mode 100755 new mode 100644 diff --git a/share/qtvcp/screens/qtdragon_hd_vert/images/tool_icons/center_drill.png b/share/qtvcp/screens/qtdragon_hd_vert/images/tool_icons/center_drill.png old mode 100755 new mode 100644 diff --git a/share/qtvcp/screens/qtdragon_hd_vert/images/tool_icons/drill.png b/share/qtvcp/screens/qtdragon_hd_vert/images/tool_icons/drill.png old mode 100755 new mode 100644 diff --git a/share/qtvcp/screens/qtdragon_hd_vert/images/tool_icons/not_found.png b/share/qtvcp/screens/qtdragon_hd_vert/images/tool_icons/not_found.png old mode 100755 new mode 100644 diff --git a/share/qtvcp/screens/qtdragon_hd_vert/images/tool_icons/probe.png b/share/qtvcp/screens/qtdragon_hd_vert/images/tool_icons/probe.png old mode 100755 new mode 100644 diff --git a/share/qtvcp/screens/qtdragon_hd_vert/images/tool_icons/surfacing.png b/share/qtvcp/screens/qtdragon_hd_vert/images/tool_icons/surfacing.png old mode 100755 new mode 100644 diff --git a/share/qtvcp/screens/qtdragon_hd_vert/images/tool_icons/upcut_spiral.png b/share/qtvcp/screens/qtdragon_hd_vert/images/tool_icons/upcut_spiral.png old mode 100755 new mode 100644 diff --git a/share/qtvcp/screens/qtdragon_hd_vert/images/tool_icons/vbit-90deg.png b/share/qtvcp/screens/qtdragon_hd_vert/images/tool_icons/vbit-90deg.png old mode 100755 new mode 100644 diff --git a/share/qtvcp/screens/woodpecker/tool_icons/ball_end_mill.png b/share/qtvcp/screens/woodpecker/tool_icons/ball_end_mill.png old mode 100755 new mode 100644 diff --git a/share/qtvcp/screens/woodpecker/tool_icons/ballend_straight.png b/share/qtvcp/screens/woodpecker/tool_icons/ballend_straight.png old mode 100755 new mode 100644 diff --git a/share/qtvcp/screens/woodpecker/tool_icons/center_drill.png b/share/qtvcp/screens/woodpecker/tool_icons/center_drill.png old mode 100755 new mode 100644 diff --git a/share/qtvcp/screens/woodpecker/tool_icons/drill.png b/share/qtvcp/screens/woodpecker/tool_icons/drill.png old mode 100755 new mode 100644 diff --git a/share/qtvcp/screens/woodpecker/tool_icons/not_found.png b/share/qtvcp/screens/woodpecker/tool_icons/not_found.png old mode 100755 new mode 100644 diff --git a/share/qtvcp/screens/woodpecker/tool_icons/probe.png b/share/qtvcp/screens/woodpecker/tool_icons/probe.png old mode 100755 new mode 100644 diff --git a/share/qtvcp/screens/woodpecker/tool_icons/spiral_downcut_2F.png b/share/qtvcp/screens/woodpecker/tool_icons/spiral_downcut_2F.png old mode 100755 new mode 100644 diff --git a/share/qtvcp/screens/woodpecker/tool_icons/spiral_upcut.png b/share/qtvcp/screens/woodpecker/tool_icons/spiral_upcut.png old mode 100755 new mode 100644 diff --git a/share/qtvcp/screens/woodpecker/tool_icons/surfacing.png b/share/qtvcp/screens/woodpecker/tool_icons/surfacing.png old mode 100755 new mode 100644 diff --git a/share/qtvcp/screens/woodpecker/tool_icons/tapered_ball_end.png b/share/qtvcp/screens/woodpecker/tool_icons/tapered_ball_end.png old mode 100755 new mode 100644 diff --git a/share/qtvcp/screens/woodpecker/tool_icons/upcut_spiral.png b/share/qtvcp/screens/woodpecker/tool_icons/upcut_spiral.png old mode 100755 new mode 100644 diff --git a/share/qtvcp/screens/woodpecker/tool_icons/vbit-90deg.png b/share/qtvcp/screens/woodpecker/tool_icons/vbit-90deg.png old mode 100755 new mode 100644