Skip to content

Commit fc40149

Browse files
committed
update marbastlib to work with multiple projects in ebastler-kicad-repository
1 parent 19deb9b commit fc40149

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/workflows/kicad-pcm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ jobs:
4242
ref: refs/heads/main
4343
repo: ebastler/ebastler-kicad-repository
4444
token: ${{ secrets.PERSONAL_TOKEN }}
45-
inputs: '{ "VERSION": "${{env.VERSION}}", "DOWNLOAD_SHA256": "${{env.DOWNLOAD_SHA256}}", "DOWNLOAD_SIZE": "${{env.DOWNLOAD_SIZE}}", "DOWNLOAD_URL": "${{env.DOWNLOAD_URL}}", "INSTALL_SIZE": "${{env.INSTALL_SIZE}}", "KICAD_VERSION": "${{env.KICAD_VERSION}}" }'
45+
inputs: '{ "VERSION": "${{env.VERSION}}", "DOWNLOAD_SHA256": "${{env.DOWNLOAD_SHA256}}", "DOWNLOAD_SIZE": "${{env.DOWNLOAD_SIZE}}", "DOWNLOAD_URL": "${{env.DOWNLOAD_URL}}", "INSTALL_SIZE": "${{env.INSTALL_SIZE}}", "KICAD_VERSION": "${{env.KICAD_VERSION}}", "PROJECT_NAME": "${{env.PROJECT_NAME}}" }'

PCM/create_pcm_archive.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@ echo VERSION=$VERSION >> $GITHUB_ENV
4242
echo DOWNLOAD_SHA256=$(shasum --algorithm 256 PCM/KiCAD-PCM-$VERSION.zip | xargs | cut -d' ' -f1) >> $GITHUB_ENV
4343
echo DOWNLOAD_SIZE=$(ls -l PCM/KiCAD-PCM-$VERSION.zip | xargs | cut -d' ' -f5) >> $GITHUB_ENV
4444
echo DOWNLOAD_URL="https:\/\/github.com\/ebastler\/marbastlib\/releases\/download\/$VERSION\/KiCAD-PCM-$VERSION.zip" >> $GITHUB_ENV
45-
echo INSTALL_SIZE=$(unzip -l PCM/KiCAD-PCM-$VERSION.zip | tail -1 | xargs | cut -d' ' -f1) >> $GITHUB_ENV
46-
echo KICAD_VERSION=$(grep kicad_version metadata.template.json |grep -o -E "[0-9]+\.[0-9]" PCM/metadata.template.json) >> $GITHUB_ENV
45+
echo KICAD_VERSION=$(grep -oP '(?<="kicad_version": ")[^"]*' PCM/metadata.template.json) >> $GITHUB_ENV
46+
echo PROJECT_NAME=$(grep name PCM/metadata.template.json | head -1 | grep -oP '(?<="name": ")[^"]*') >> $GITHUB_ENV

0 commit comments

Comments
 (0)