Skip to content

Commit c6b78df

Browse files
hansuhansu
committed
Merge branch 'master' into gmoccapy-3-5-2
2 parents 0077c17 + 340e345 commit c6b78df

File tree

991 files changed

+370739
-114207
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

991 files changed

+370739
-114207
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ jobs:
3030
- name: Build RIP & test
3131
run: |
3232
set -x
33-
sudo apt-get install -y eatmydata
33+
sudo apt-get --yes -o Acquire::Retries=5 install eatmydata
3434
eatmydata ./scripts/travis-install-build-deps.sh
35-
sudo eatmydata apt --quiet --yes upgrade
35+
sudo eatmydata apt --yes --quiet -o Acquire::Retries=5 upgrade
3636
cd src
3737
eatmydata ./autogen.sh
3838
eatmydata ./configure --disable-check-runtime-deps
@@ -55,10 +55,10 @@ jobs:
5555
- name: Clang build RIP & test
5656
run: |
5757
set -x
58-
sudo apt-get install -y eatmydata
58+
sudo apt-get --yes -o Acquire::Retries=5 install eatmydata
5959
eatmydata ./scripts/travis-install-build-deps.sh
60-
sudo eatmydata apt-get install -y clang
61-
sudo eatmydata apt --quiet --yes upgrade
60+
sudo eatmydata apt-get -y -o Acquire::Retries=5 install clang
61+
sudo eatmydata apt --yes --quiet -o Acquire::Retries=5 upgrade
6262
cd src
6363
eatmydata ./autogen.sh
6464
CC=clang CXX=clang++ eatmydata ./configure --disable-check-runtime-deps
@@ -81,8 +81,8 @@ jobs:
8181
- name: Build HTML docmentation
8282
run: |
8383
./scripts/travis-install-build-deps.sh
84-
sudo apt-get install -y eatmydata
85-
sudo eatmydata apt --quiet --yes upgrade
84+
sudo apt-get -y -o Acquire::Retries=5 install eatmydata
85+
sudo eatmydata apt --yes --quiet -o Acquire::Retries=5 upgrade
8686
cd src
8787
eatmydata ./autogen.sh
8888
eatmydata ./configure --disable-check-runtime-deps --enable-build-documentation=html
@@ -113,11 +113,11 @@ jobs:
113113
run: |
114114
set -e
115115
set -x
116-
apt-get --quiet update
117-
apt-get --yes --quiet install eatmydata curl
118-
eatmydata apt --quiet --yes upgrade
116+
apt-get --quiet -o Acquire::Retries=5 update
117+
apt-get --yes --quiet -o Acquire::Retries=5 install eatmydata curl
118+
eatmydata apt --yes --quiet -o Acquire::Retries=5 upgrade
119119
# Install stuff needed to check out the linuxcnc repo and turn it into a debian source package.
120-
eatmydata apt-get --yes --quiet install --no-install-suggests git lsb-release python3 devscripts
120+
eatmydata apt-get --yes --quiet -o Acquire::Retries=5 install --no-install-suggests git lsb-release python3 devscripts
121121
122122
- uses: actions/checkout@v3
123123
with:
@@ -138,11 +138,11 @@ jobs:
138138
esac
139139
set -e
140140
set -x
141-
eatmydata apt-get --yes --quiet install --no-install-recommends gpg software-properties-common
141+
eatmydata apt-get --yes --quiet -o Acquire::Retries=5 install --no-install-recommends gpg software-properties-common
142142
eatmydata gpg --homedir="${PWD}/gnupg" --output /etc/apt/trusted.gpg.d/linuxcnc-deb-archive.gpg --export 3CB9FD148F374FEF
143143
DIST=$(echo ${{matrix.image}} | cut -d : -f 2)
144144
eatmydata add-apt-repository "deb http://linuxcnc.org $DIST base"
145-
eatmydata apt-get --quiet update
145+
eatmydata apt-get --quiet -o Acquire::Retries=5 update
146146
147147
- name: Build architecture-specific Debian packages
148148
env:
@@ -157,16 +157,16 @@ jobs:
157157
eatmydata debian/update-dch-from-git
158158
eatmydata scripts/get-version-from-git | sed -re 's/^v(.*)$/\1/' >| VERSION; cat VERSION
159159
eatmydata git diff
160-
eatmydata apt-get --yes --quiet build-dep --arch-only .
160+
eatmydata apt-get --yes --quiet -o Acquire::Retries=5 build-dep --arch-only .
161161
eatmydata debuild -us -uc --build=any
162162
- name: Test debian packages
163163
env:
164164
DEBIAN_FRONTEND: noninteractive
165165
run: |
166166
set -e
167167
set -x
168-
eatmydata apt-get --yes --quiet install ../*.deb
169-
eatmydata apt-get --yes --quiet install sudo # some tests run sudo...
168+
eatmydata apt-get --yes --quiet -o Acquire::Retries=5 install ../*.deb
169+
eatmydata apt-get --yes --quiet -o Acquire::Retries=5 install sudo # some tests run sudo...
170170
eatmydata adduser --disabled-password --gecos "" testrunner
171171
eatmydata passwd -d testrunner
172172
eatmydata adduser testrunner sudo
@@ -220,11 +220,11 @@ jobs:
220220
run: |
221221
set -e
222222
set -x
223-
apt-get --quiet update
224-
apt-get --yes --quiet install eatmydata curl
225-
eatmydata apt --quiet --yes upgrade
223+
apt-get --quiet -o Acquire::Retries=5 update
224+
apt-get --yes --quiet -o Acquire::Retries=5 install eatmydata curl
225+
eatmydata apt --yes --quiet -o Acquire::Retries=5 upgrade
226226
# Install stuff needed to check out the linuxcnc repo and turn it into a debian source package.
227-
eatmydata apt-get --yes --quiet install --no-install-suggests git lsb-release python3 devscripts
227+
eatmydata apt-get --yes --quiet -o Acquire::Retries=5 install --no-install-suggests git lsb-release python3 devscripts
228228
229229
- uses: actions/checkout@v3
230230
with:
@@ -245,11 +245,11 @@ jobs:
245245
esac
246246
set -e
247247
set -x
248-
eatmydata apt-get --yes --quiet install gpg software-properties-common
248+
eatmydata apt-get --yes --quiet -o Acquire::Retries=5 install gpg software-properties-common
249249
eatmydata gpg --homedir="${PWD}/gnupg" --output /etc/apt/trusted.gpg.d/linuxcnc-deb-archive.gpg --export 3CB9FD148F374FEF
250250
DIST=$(echo ${{matrix.image}} | cut -d : -f 2)
251251
eatmydata add-apt-repository "deb http://linuxcnc.org $DIST base"
252-
eatmydata apt-get --quiet update
252+
eatmydata apt-get --quiet -o Acquire::Retries=5 update
253253
254254
- name: Build architecture-independent Debian packages
255255
env:
@@ -264,15 +264,15 @@ jobs:
264264
eatmydata debian/update-dch-from-git
265265
eatmydata scripts/get-version-from-git | sed -re 's/^v(.*)$/\1/' >| VERSION; cat VERSION
266266
eatmydata git diff
267-
eatmydata apt-get --yes --quiet build-dep --indep-only .
267+
eatmydata apt-get --yes --quiet -o Acquire::Retries=5 build-dep --indep-only .
268268
eatmydata debuild -us -uc --build=source,all
269269
- name: Test install debian packages
270270
env:
271271
DEBIAN_FRONTEND: noninteractive
272272
run: |
273273
set -e
274274
set -x
275-
eatmydata apt-get --yes --quiet install ../*.deb
275+
eatmydata apt-get --yes --quiet -o Acquire::Retries=5 install ../*.deb
276276
- name: Gather build artifacts
277277
run: |
278278
set -e
@@ -311,7 +311,7 @@ jobs:
311311
run: |
312312
set -x
313313
git fetch --recurse-submodules=no https://github.com/linuxcnc/linuxcnc refs/tags/*:refs/tags/*
314-
sudo apt-get -y install cppcheck shellcheck
314+
sudo apt-get --yes -o Acquire::Retries=5 install cppcheck shellcheck
315315
scripts/cppcheck.sh
316316
- name: Shellcheck
317317
continue-on-error: true

‎configs/by_interface/parport/nist-lathe/inch.ini‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@ HOME_LATCH_VEL = -0.025
154154
HOME_USE_INDEX = NO
155155
HOME_IGNORE_LIMITS = NO
156156
HOME_SEQUENCE=1
157-
HOME_IS_SHARED = 1
158157
#+ Second axis
159158

160159
[AXIS_Y]
@@ -208,7 +207,6 @@ HOME_LATCH_VEL = -0.025
208207
HOME_USE_INDEX = NO
209208
HOME_IGNORE_LIMITS = NO
210209
HOME_SEQUENCE = 0
211-
HOME_IS_SHARED = 1
212210
###############################################################################
213211
# section for main IO controller parameters
214212
###############################################################################

‎configs/by_machine/scorbot-er-3/scorbot-er-3.ini‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,6 @@ HOME_SEQUENCE = 0
323323
#HOME_USE_INDEX = NO
324324
#HOME_IGNORE_LIMITS = NO
325325
#HOME_SEQUENCE = 0
326-
#HOME_IS_SHARED = 1
327326

328327

329328
#[AXIS_6]
@@ -346,7 +345,6 @@ HOME_SEQUENCE = 0
346345
#HOME_USE_INDEX = NO
347346
#HOME_IGNORE_LIMITS = NO
348347
#HOME_SEQUENCE = 0
349-
#HOME_IS_SHARED = 1
350348

351349

352350
#[AXIS_7]
@@ -369,5 +367,4 @@ HOME_SEQUENCE = 0
369367
#HOME_USE_INDEX = NO
370368
#HOME_IGNORE_LIMITS = NO
371369
#HOME_SEQUENCE = 0
372-
#HOME_IS_SHARED = 1
373370

‎configs/sim/axis/axis.ini‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ HOME_LATCH_VEL = 20.0
175175
HOME_USE_INDEX = NO
176176
HOME_IGNORE_LIMITS = NO
177177
HOME_SEQUENCE = 1
178-
HOME_IS_SHARED = 1
179178

180179
[JOINT_1]
181180
TYPE = LINEAR
@@ -219,4 +218,3 @@ HOME_LATCH_VEL = 20.0
219218
HOME_USE_INDEX = NO
220219
HOME_IGNORE_LIMITS = NO
221220
HOME_SEQUENCE = 0
222-
HOME_IS_SHARED = 1

0 commit comments

Comments
 (0)