Skip to content

Commit 4f7d3fd

Browse files
abhiTronixabhiTronix
committed
[DEBUG] Major bugs fixed
- Fixed `GCC_VERSION` variable not available for 32-bit binaries in SF_Deployer bash script. - Added `GCC_VERSION` variable to 32-bit cross compiler bash scripts. - Removed old comparison behavior in 64-bit cross compiler bash scripts. - Added `GCC_VERSION` to CI workflow matrix. - Removed redundant code and CI workflow runs.
1 parent ea43f16 commit 4f7d3fd

11 files changed

+66
-57
lines changed

‎.github/workflows/builder_0_1.yml

+6-10
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,11 @@ jobs:
5757
runs-on: ubuntu-18.04
5858
strategy:
5959
matrix:
60+
gcc_versions: [6.3.0, 8.3.0]
6061
rpios_types: [stretch, buster]
6162
env:
6263
RPIOS_TYPE: ${{ matrix.rpios_types }}
64+
GCC_VERSION: ${{ matrix.gcc_versions }}
6365
COMPILER_TYPE: CROSS
6466
BASE: true
6567
steps:
@@ -74,8 +76,6 @@ jobs:
7476
chmod +x patches/curl_stfp_patcher
7577
dos2unix utils/SF_deployer
7678
chmod +x utils/SF_deployer
77-
dos2unix utils/SF_docs_deployer
78-
chmod +x utils/SF_docs_deployer
7979
if: success()
8080
- name: install
8181
run: |
@@ -85,13 +85,13 @@ jobs:
8585
source ~/.bashrc && echo $PATH
8686
if: success()
8787
- name: script
88-
run: bash build-scripts/CI/CIBB_32b -r $RPI_TYPE -o $RPIOS_TYPE
88+
run: bash build-scripts/CI/CIBB_32b -g $GCC_VERSION -r $RPI_TYPE -o $RPIOS_TYPE
8989
shell: bash
9090
if: success() && (github.event_name == 'pull_request' || github.event_name == 'release' || (github.event_name == 'push' && contains(github.event.head_commit.message, '[DEBUG]')))
9191
- name: before_script
9292
run: bash patches/curl_stfp_patcher
9393
shell: bash
94-
if: success()
94+
if: success() && github.event_name == 'release' && github.event.action == 'published'
9595
- name: deploy
9696
run: bash utils/SF_deployer
9797
shell: bash
@@ -121,8 +121,6 @@ jobs:
121121
chmod +x patches/curl_stfp_patcher
122122
dos2unix utils/SF_deployer
123123
chmod +x utils/SF_deployer
124-
dos2unix utils/SF_docs_deployer
125-
chmod +x utils/SF_docs_deployer
126124
if: success()
127125
- name: install
128126
run: |
@@ -138,7 +136,7 @@ jobs:
138136
- name: before_script
139137
run: bash patches/curl_stfp_patcher
140138
shell: bash
141-
if: success()
139+
if: success() && github.event_name == 'release' && github.event.action == 'published'
142140
- name: deploy
143141
run: bash utils/SF_deployer
144142
shell: bash
@@ -168,8 +166,6 @@ jobs:
168166
chmod +x patches/curl_stfp_patcher
169167
dos2unix utils/SF_deployer
170168
chmod +x utils/SF_deployer
171-
dos2unix utils/SF_docs_deployer
172-
chmod +x utils/SF_docs_deployer
173169
if: success()
174170
- name: install
175171
run: |
@@ -185,7 +181,7 @@ jobs:
185181
- name: before_script
186182
run: bash patches/curl_stfp_patcher
187183
shell: bash
188-
if: success()
184+
if: success() && github.event_name == 'release' && github.event.action == 'published'
189185
- name: deploy
190186
run: bash utils/SF_deployer
191187
shell: bash

‎.github/workflows/builder_2_3.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,10 @@ jobs:
5858
strategy:
5959
matrix:
6060
rpios_types: [stretch, buster]
61+
gcc_versions: [6.3.0, 8.3.0]
6162
env:
6263
RPIOS_TYPE: ${{ matrix.rpios_types }}
64+
GCC_VERSION: ${{ matrix.gcc_versions }}
6365
COMPILER_TYPE: CROSS
6466
BASE: true
6567
steps:
@@ -83,13 +85,13 @@ jobs:
8385
source ~/.bashrc && echo $PATH
8486
if: success()
8587
- name: script
86-
run: bash build-scripts/CI/CIBB_32b -r $RPI_TYPE -o $RPIOS_TYPE
88+
run: bash build-scripts/CI/CIBB_32b -g $GCC_VERSION -r $RPI_TYPE -o $RPIOS_TYPE
8789
shell: bash
8890
if: success() && (github.event_name == 'pull_request' || github.event_name == 'release' || (github.event_name == 'push' && contains(github.event.head_commit.message, '[DEBUG]')))
8991
- name: before_script
9092
run: bash patches/curl_stfp_patcher
9193
shell: bash
92-
if: success()
94+
if: success() && github.event_name == 'release' && github.event.action == 'published'
9395
- name: deploy
9496
run: bash utils/SF_deployer
9597
shell: bash
@@ -119,8 +121,6 @@ jobs:
119121
chmod +x patches/curl_stfp_patcher
120122
dos2unix utils/SF_deployer
121123
chmod +x utils/SF_deployer
122-
dos2unix utils/SF_docs_deployer
123-
chmod +x utils/SF_docs_deployer
124124
if: success()
125125
- name: install
126126
run: |
@@ -136,7 +136,7 @@ jobs:
136136
- name: before_script
137137
run: bash patches/curl_stfp_patcher
138138
shell: bash
139-
if: success()
139+
if: success() && github.event_name == 'release' && github.event.action == 'published'
140140
- name: deploy
141141
run: bash utils/SF_deployer
142142
shell: bash
@@ -181,7 +181,7 @@ jobs:
181181
- name: before_script
182182
run: bash patches/curl_stfp_patcher
183183
shell: bash
184-
if: success()
184+
if: success() && github.event_name == 'release' && github.event.action == 'published'
185185
- name: deploy
186186
run: bash utils/SF_deployer
187187
shell: bash

‎.github/workflows/builder_3_plus.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,10 @@ jobs:
5858
strategy:
5959
matrix:
6060
rpios_types: [stretch, buster]
61+
gcc_versions: [6.3.0, 8.3.0]
6162
env:
6263
RPIOS_TYPE: ${{ matrix.rpios_types }}
64+
GCC_VERSION: ${{ matrix.gcc_versions }}
6365
COMPILER_TYPE: CROSS
6466
BASE: true
6567
steps:
@@ -83,13 +85,13 @@ jobs:
8385
source ~/.bashrc && echo $PATH
8486
if: success()
8587
- name: script
86-
run: bash build-scripts/CI/CIBB_32b -r $RPI_TYPE -o $RPIOS_TYPE
88+
run: bash build-scripts/CI/CIBB_32b -g $GCC_VERSION -r $RPI_TYPE -o $RPIOS_TYPE
8789
shell: bash
8890
if: success() && (github.event_name == 'pull_request' || github.event_name == 'release' || (github.event_name == 'push' && contains(github.event.head_commit.message, '[DEBUG]')))
8991
- name: before_script
9092
run: bash patches/curl_stfp_patcher
9193
shell: bash
92-
if: success()
94+
if: success() && github.event_name == 'release' && github.event.action == 'published'
9395
- name: deploy
9496
run: bash utils/SF_deployer
9597
shell: bash
@@ -134,7 +136,7 @@ jobs:
134136
- name: before_script
135137
run: bash patches/curl_stfp_patcher
136138
shell: bash
137-
if: success()
139+
if: success() && github.event_name == 'release' && github.event.action == 'published'
138140
- name: deploy
139141
run: bash utils/SF_deployer
140142
shell: bash
@@ -164,8 +166,6 @@ jobs:
164166
chmod +x patches/curl_stfp_patcher
165167
dos2unix utils/SF_deployer
166168
chmod +x utils/SF_deployer
167-
dos2unix utils/SF_docs_deployer
168-
chmod +x utils/SF_docs_deployer
169169
if: success()
170170
- name: install
171171
run: |
@@ -181,7 +181,7 @@ jobs:
181181
- name: before_script
182182
run: bash patches/curl_stfp_patcher
183183
shell: bash
184-
if: success()
184+
if: success() && github.event_name == 'release' && github.event.action == 'published'
185185
- name: deploy
186186
run: bash utils/SF_deployer
187187
shell: bash

‎.github/workflows/builder_64.yml

+3-9
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@ jobs:
7676
chmod +x patches/curl_stfp_patcher
7777
dos2unix utils/SF_deployer
7878
chmod +x utils/SF_deployer
79-
dos2unix utils/SF_docs_deployer
80-
chmod +x utils/SF_docs_deployer
8179
if: success()
8280
- name: install
8381
run: |
@@ -93,7 +91,7 @@ jobs:
9391
- name: before_script
9492
run: bash patches/curl_stfp_patcher
9593
shell: bash
96-
if: success()
94+
if: success() && github.event_name == 'release' && github.event.action == 'published'
9795
- name: deploy
9896
run: bash utils/SF_deployer
9997
shell: bash
@@ -123,8 +121,6 @@ jobs:
123121
chmod +x patches/curl_stfp_patcher
124122
dos2unix utils/SF_deployer
125123
chmod +x utils/SF_deployer
126-
dos2unix utils/SF_docs_deployer
127-
chmod +x utils/SF_docs_deployer
128124
if: success()
129125
- name: install
130126
run: |
@@ -140,7 +136,7 @@ jobs:
140136
- name: before_script
141137
run: bash patches/curl_stfp_patcher
142138
shell: bash
143-
if: success()
139+
if: success() && github.event_name == 'release' && github.event.action == 'published'
144140
- name: deploy
145141
run: bash utils/SF_deployer
146142
shell: bash
@@ -170,8 +166,6 @@ jobs:
170166
chmod +x patches/curl_stfp_patcher
171167
dos2unix utils/SF_deployer
172168
chmod +x utils/SF_deployer
173-
dos2unix utils/SF_docs_deployer
174-
chmod +x utils/SF_docs_deployer
175169
if: success()
176170
- name: install
177171
run: |
@@ -187,7 +181,7 @@ jobs:
187181
- name: before_script
188182
run: bash patches/curl_stfp_patcher
189183
shell: bash
190-
if: success()
184+
if: success() && github.event_name == 'release' && github.event.action == 'published'
191185
- name: deploy
192186
run: bash utils/SF_deployer
193187
shell: bash

‎.github/workflows/builder_x86_64.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ jobs:
7272
chmod +x patches/curl_stfp_patcher
7373
dos2unix utils/SF_deployer
7474
chmod +x utils/SF_deployer
75-
dos2unix utils/SF_docs_deployer
76-
chmod +x utils/SF_docs_deployer
7775
if: success()
7876
- name: install
7977
run: |
@@ -89,7 +87,7 @@ jobs:
8987
- name: before_script
9088
run: bash patches/curl_stfp_patcher
9189
shell: bash
92-
if: success()
90+
if: success() && github.event_name == 'release' && github.event.action == 'published'
9391
- name: deploy
9492
run: bash utils/SF_deployer
9593
shell: bash
@@ -116,8 +114,6 @@ jobs:
116114
chmod +x patches/curl_stfp_patcher
117115
dos2unix utils/SF_deployer
118116
chmod +x utils/SF_deployer
119-
dos2unix utils/SF_docs_deployer
120-
chmod +x utils/SF_docs_deployer
121117
if: success()
122118
- name: install
123119
run: |
@@ -133,7 +129,7 @@ jobs:
133129
- name: before_script
134130
run: bash patches/curl_stfp_patcher
135131
shell: bash
136-
if: success()
132+
if: success() && github.event_name == 'release' && github.event.action == 'published'
137133
- name: deploy
138134
run: bash utils/SF_deployer
139135
shell: bash

‎build-scripts/CI/CIBB_32b

+16-4
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ helpfunction() {
3434
echo ""
3535
echo ""
3636
echo "Usage: $0 -g [GCC version] -r [Target Pi type] -o [Target Pi OS type]"
37+
echo -e "\t-g GCC base version?: (6.3.0|8.3.0)"
3738
echo -e "\t-r What's yours Raspberry Pi type?: (0-1|2-3|3+)"
3839
echo -e "\t-o What's yours Raspberry Pi OS type?: (stretch|buster)"
3940
echo ""
@@ -42,17 +43,20 @@ helpfunction() {
4243
}
4344

4445
#input arguments handler
45-
while getopts "r:o:" opt; do
46+
while getopts "g:r:o:" opt; do
4647
case "$opt" in
48+
g) GCC_VERSION="$OPTARG" ;;
4749
r) RPI_TYPE="$OPTARG" ;;
4850
o) RPIOS_TYPE="$OPTARG" ;;
4951
?) helpfunction ;; #prints help function for invalid parameter
5052
esac
5153
done
5254
#validates parameters and print usage helper function in case parameters are missing
53-
if [ -z "$RPI_TYPE" ] || [ -z "$RPIOS_TYPE" ]; then
55+
if [ -z "$GCC_VERSION" ] || [ -z "$RPI_TYPE" ] || [ -z "$RPIOS_TYPE" ]; then
5456
echo "Required parameters are missing!"
5557
helpfunction
58+
else
59+
echo "Parameters configured!"
5660
fi
5761

5862
#collect parameters from raspbery pi type
@@ -80,16 +84,24 @@ fi
8084
if [ "$RPIOS_TYPE" = "stretch" ]; then
8185
GLIBC_VERSION=2.24
8286
BINUTILS_VERSION=2.28
83-
GCC_VERSION=6.3.0 #enforced
8487
elif [ "$RPIOS_TYPE" = "buster" ]; then
8588
GLIBC_VERSION=2.28
8689
BINUTILS_VERSION=2.31.1
87-
GCC_VERSION=8.3.0 #enforced
8890
else
8991
echo "Invalid argument value: $RPIOS_TYPE"
9092
exit
9193
fi
9294

95+
if [ "$RPIOS_TYPE" = "stretch" ] && [ "$GCC_VERSION" != "6.3.0" ]; then
96+
echo "Invalid GCC for stretch: $GCC_VERSION!"
97+
exit
98+
fi
99+
# exit if not valid GCC
100+
if [ "$RPIOS_TYPE" = "buster" ] && [ "$GCC_VERSION" != "8.3.0" ]; then
101+
echo "Invalid GCC for buster: $GCC_VERSION!"
102+
exit
103+
fi
104+
93105
#collect build directory if not defined
94106
if [ "$BUILDDIR" = "" ]; then
95107
#select temp directory as default

‎build-scripts/CI/CIBB_64b

+4-4
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@ else
7171
exit
7272
fi
7373

74+
if [ "$RPIOS_TYPE" = "stretch" ] && [ "$GCC_VERSION" != "6.3.0" ]; then
75+
echo "Invalid GCC for stretch: $GCC_VERSION!"
76+
exit
77+
fi
7478
# exit if not valid GCC
7579
if [ "$RPIOS_TYPE" = "buster" ] && [ "$GCC_VERSION" != "8.3.0" ]; then
7680
echo "Invalid GCC for buster: $GCC_VERSION!"
7781
exit
7882
fi
79-
if [ "$RPIOS_TYPE" = "stretch" ] && [ "$GCC_VERSION" != "6.3.0" ]; then
80-
echo "Invalid GCC for stretch: $GCC_VERSION!"
81-
exit
82-
fi
8383

8484
#collect build directory if not defined
8585
if [ "$BUILDDIR" = "" ]; then

‎build-scripts/CI/CICTB_64b

+14-10
Original file line numberDiff line numberDiff line change
@@ -60,19 +60,23 @@ else
6060
fi
6161

6262
#collect dependencies versions from raspberry pi os
63-
if [ "$RPIOS_TYPE" = "stretch" ] || [ "$GCC_VERSION" \< "8.3.0" ]; then
64-
GCCBASE_VERSION=6.3.0
63+
if [ "$RPIOS_TYPE" = "stretch" ]; then
64+
if [ "$GCC_VERSION" == "8.3.0" ]; then
65+
echo "$GCC_VERSION is not supported on stretch!"
66+
exit 0
67+
else
68+
GCCBASE_VERSION=6.3.0
69+
fi
6570
elif [ "$RPIOS_TYPE" = "buster" ]; then
66-
GCCBASE_VERSION=8.3.0
71+
if echo ${GCC_VERSION%.*} "8.3" | awk '{exit ( $1 >= $2 )}'; then
72+
echo "$GCC_VERSION is not supported on buster!"
73+
exit 0
74+
else
75+
GCCBASE_VERSION=8.3.0
76+
fi
6777
else
6878
echo "Invalid argument value: $RPIOS_TYPE"
69-
exit
70-
fi
71-
72-
# exit if GCC < 8.3.0 for buster
73-
if [ "$RPIOS_TYPE" = "buster" ] && [ "$GCC_VERSION" \< "8.3.0" ]; then
74-
echo "Invalid GCC for buster: $GCC_VERSION!"
75-
exit
79+
exit 1
7680
fi
7781

7882
#collect build directory if not defined

‎build-scripts/CI/CINTB_64b

+7
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,13 @@ else
5959
echo "Parameters configured!"
6060
fi
6161

62+
if [ "$RPIOS_TYPE" = "buster" ]; then
63+
if echo ${GCC_VERSION%.*} "8.3" | awk '{exit ( $1 >= $2 )}'; then
64+
echo "$GCC_VERSION is not supported on buster!"
65+
exit 0
66+
fi
67+
fi
68+
6269
#collect build directory if not defined
6370
if [ "$BUILDDIR" = "" ]; then
6471
#select temp directory

0 commit comments

Comments
 (0)