Skip to content

Commit 2fba837

Browse files
committed
fix: update build-deck workflow for new Makefile targets
- Replace obsolete 'fetch-and-build' with correct targets - Build both merit badges and cub adventures decks - Update release naming and description for dual deck support
1 parent 84e02f6 commit 2fba837

File tree

1 file changed

+17
-16
lines changed

1 file changed

+17
-16
lines changed

.github/workflows/build-deck.yml

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,10 @@ jobs:
6969
if: steps.check-release.outputs.should-build == 'true'
7070
run: uv sync
7171

72-
- name: Build Anki deck
72+
- name: Build Anki decks
7373
if: steps.check-release.outputs.should-build == 'true'
74-
run: make fetch-and-build
74+
run: |
75+
make fetch-releases extract-archives build-all
7576
env:
7677
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7778

@@ -81,11 +82,11 @@ jobs:
8182
env:
8283
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8384
run: |
84-
DECK_FILE=$(ls *.apkg | head -1)
85-
echo "deck-file=$DECK_FILE" >> $GITHUB_OUTPUT
85+
DECK_FILES=$(ls *.apkg | tr '\n' ' ')
86+
echo "deck-files=$DECK_FILES" >> $GITHUB_OUTPUT
8687
87-
DECK_SIZE=$(du -h "$DECK_FILE" | cut -f1)
88-
echo "deck-size=$DECK_SIZE" >> $GITHUB_OUTPUT
88+
TOTAL_SIZE=$(du -ch *.apkg | tail -1 | cut -f1)
89+
echo "total-size=$TOTAL_SIZE" >> $GITHUB_OUTPUT
8990
9091
SCOUT_TAG=$(gh release list --repo dasevilla/scout-archive --limit 1 --json tagName --jq '.[0].tagName')
9192
echo "scout-tag=$SCOUT_TAG" >> $GITHUB_OUTPUT
@@ -101,9 +102,9 @@ jobs:
101102
RELEASE_NAME="${{ inputs.release_name }}"
102103
else
103104
if [ "$GITHUB_RUN_ATTEMPT" = "1" ]; then
104-
RELEASE_NAME="Merit Badge Deck - $DATE (Build $GITHUB_RUN_NUMBER)"
105+
RELEASE_NAME="Scout Anki Decks - $DATE (Build $GITHUB_RUN_NUMBER)"
105106
else
106-
RELEASE_NAME="Merit Badge Deck - $DATE (Build $GITHUB_RUN_NUMBER, Attempt $GITHUB_RUN_ATTEMPT)"
107+
RELEASE_NAME="Scout Anki Decks - $DATE (Build $GITHUB_RUN_NUMBER, Attempt $GITHUB_RUN_ATTEMPT)"
107108
fi
108109
fi
109110
echo "release-name=$RELEASE_NAME" >> $GITHUB_OUTPUT
@@ -122,29 +123,29 @@ jobs:
122123
tag_name: ${{ steps.deck-info.outputs.release-tag }}
123124
name: ${{ steps.deck-info.outputs.release-name }}
124125
body: |
125-
## Merit Badge Anki Deck
126+
## Scout Anki Decks
126127
127-
This release contains an Anki deck for learning Scouting America merit badges by image.
128+
This release contains Anki decks for learning Scouting America content by image.
128129
129130
### Details
130-
- **Deck file**: `${{ steps.deck-info.outputs.deck-file }}`
131-
- **File size**: ${{ steps.deck-info.outputs.deck-size }}
131+
- **Deck files**: ${{ steps.deck-info.outputs.deck-files }}
132+
- **Total size**: ${{ steps.deck-info.outputs.total-size }}
132133
- **Source data**: [scout-archive/${{ steps.deck-info.outputs.scout-tag }}](https://github.com/dasevilla/scout-archive/releases/tag/${{ steps.deck-info.outputs.scout-tag }})
133134
- **Generated**: ${{ steps.deck-info.outputs.generated-date }}
134135
135136
### How to Use
136-
1. Download the `.apkg` file below
137+
1. Download the `.apkg` file(s) below
137138
2. Open Anki on your device
138139
3. Go to File → Import
139140
4. Select the downloaded `.apkg` file
140141
5. The deck will be imported and ready to study!
141142
142143
### What's Included
143-
- Merit badge images on the front of cards
144-
- Badge names and descriptions on the back
144+
- **Merit Badges**: Badge images with names, descriptions, and Eagle required indicators
145+
- **Cub Adventures**: Adventure loop images with names, ranks, types, and descriptions
145146
- Stable card IDs to prevent duplicates when reimporting
146147
147-
Generated automatically from the [scout-merit-badges-anki](https://github.com/dasevilla/scout-merit-badges-anki) project.
148+
Generated automatically from the [scout-anki](https://github.com/dasevilla/scout-anki) project.
148149
files: |
149150
*.apkg
150151
draft: false

0 commit comments

Comments
 (0)