Skip to content

Commit 50e29dc

Browse files
committed
ci: strip revision from dist fetch
1 parent 6b35312 commit 50e29dc

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/add-package.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
5050
# copy debs to repo
5151
for d in ${debs[*]}; do
52-
dist=$(echo $d | rev | cut -d"." -f2 | rev | cut -d"_" -f1)
52+
dist=$(echo $d | rev | cut -d"." -f2 | rev | cut -d"_" -f1 | cut -d"-" -f1)
5353
target=checkout/pool/$dist/$COMPONENT/$name
5454
mkdir -p $target && mv $d $target
5555
done
@@ -63,13 +63,13 @@ jobs:
6363
with:
6464
token: ${{ secrets.GITHUB_TOKEN }}
6565
path: checkout
66-
commit-message: "Add package(s) ${{ env.DEBS }} for component ${{ env.COMPONENT }}"
66+
commit-message: "chore: add debs for ${{ env.PACKAGE }} and component ${{ env.COMPONENT }}"
6767
committer: "github-actions[bot] <github-actions[bot]@users.noreply.github.com>"
6868
author: "github-actions[bot] <github-actions[bot]@users.noreply.github.com>"
69-
branch: "add-package/${{ env.COMPONENT }}-${{ env.PACKAGE}}"
70-
title: "Add package(s) ${{ env.DEBS }} for component ${{ env.COMPONENT }}"
69+
branch: "add-debs/${{ env.COMPONENT }}-${{ env.PACKAGE}}"
70+
title: "Add deb(s) for ${{ env.PACKAGE }} and component ${{ env.COMPONENT }}"
7171
body: |
72-
This PR adds the package(s) ${{ env.DEBS }} for component ${{ env.COMPONENT }} to the apt repository.
72+
This PR adds the deb(s) ${{ env.DEBS }} for package ${{ env.PACKAGE }} and component ${{ env.COMPONENT }} to the apt repository.
7373
7474
Auto-generated by [create-pull-request](https://github.com/peter-evans/create-pull-request)
7575
delete-branch: true

.github/workflows/check-for-new-camera-streamer-package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585
NEWURLS=()
8686
for i in "${!NAMES[@]}"; do
8787
name=${NAMES[i]}
88-
dist=$(echo $name | rev | cut -d"." -f2 | rev | cut -d"_" -f1)
88+
dist=$(echo $name | rev | cut -d"." -f2 | rev | cut -d"_" -f1 | cut -d"-" -f1)
8989
if [ -f "pool/$dist/rpi/camera-streamer-raspi/${NAMES[i]}" ]; then
9090
echo "Package ${NAMES[i]} already in repo"
9191
else

0 commit comments

Comments
 (0)