Skip to content

Commit b14c49a

Browse files
Fix log generation in CI package stage
1 parent 88485e5 commit b14c49a

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

package/build_boards_manager_package.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ srcdir=$PWD
6464
rm -rf package/versions/$visible_ver
6565
mkdir -p $outdir
6666

67+
new_log=$(mktemp)
6768
# Some files should be excluded from the package
6869
cat << EOF > exclude.txt
6970
.git
@@ -72,13 +73,12 @@ cat << EOF > exclude.txt
7273
.travis.yml
7374
package
7475
doc
76+
ArduinoCore-API
7577
EOF
7678
# Also include all files which are ignored by git
7779
git ls-files --other --directory >> exclude.txt
7880
# Now copy files to $outdir
7981
rsync -a -L -K --exclude-from 'exclude.txt' $srcdir/ $outdir/
80-
#mv $outdir/ArduinoCore-API/api $outdir/cores/rp2040/api
81-
rm -rf $outdir/ArduinoCore-API
8282
rm exclude.txt
8383

8484
# For compatibility, on OS X we need GNU sed which is usually called 'gsed'
@@ -158,7 +158,6 @@ echo "Downloading base package: $base_ver"
158158
old_json=package_rp2040_index_stable.json
159159
curl -L -o $old_json "https://github.com/earlephilhower/arduino-pico/releases/download/${base_ver}/package_rp2040_index.json"
160160
new_json=package_rp2040_index.json
161-
new_log=package_rp2040_index.log
162161

163162
set +e
164163
# Merge the old and new
@@ -180,7 +179,8 @@ mv tmp $new_json
180179
set -e
181180
cat $new_json | jq empty
182181

183-
git log $base_ver..HEAD --oneline | sed 's/\b / * /' | cut -f2- -d" " > $new_log
182+
cat $new_log > package_rp2040_index.log
183+
rm -f $new_log
184184

185185
popd
186186
popd

0 commit comments

Comments
 (0)