Skip to content

Commit 7ef6cb0

Browse files
committed
Fix update-geoip workflow for 'location' binary
1 parent 279fd5b commit 7ef6cb0

1 file changed

Lines changed: 13 additions & 3 deletions

File tree

.github/workflows/update-geoip.yml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,20 @@ jobs:
2323
curl \
2424
xz-utils \
2525
git \
26-
libloc-dev \
2726
python3-location \
2827
ca-certificates
2928
29+
- name: Install location CLI
30+
run: |
31+
# python3-location provides the Python C module but not the
32+
# `location` CLI binary in Debian bookworm. Install from IPFire repo.
33+
curl -sSL "https://location.ipfire.org/keys/signing-key.asc" \
34+
| gpg --dearmor -o /usr/share/keyrings/ipfire-location.gpg
35+
echo "deb [signed-by=/usr/share/keyrings/ipfire-location.gpg] https://packages.ipfire.org/repos/location bookworm/" \
36+
> /etc/apt/sources.list.d/ipfire-location.list
37+
apt-get -y update
38+
apt-get -y install location
39+
3040
- name: Install Rust toolchain
3141
run: |
3242
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
@@ -54,8 +64,8 @@ jobs:
5464
BRANCH="auto/update-geoip"
5565
DATE="$(date -u +%Y/%m/%d)"
5666
57-
git config user.name "github-actions[bot]"
58-
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
67+
git config user.name "${{ github.actor }}"
68+
git config user.email "${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com"
5969
6070
git checkout -B "$BRANCH"
6171
git add src/config/geoip src/config/geoip6

0 commit comments

Comments
 (0)