Skip to content

Commit 923bdc7

Browse files
committed
ci: revert last fix. the error was me instead
1 parent fb8332a commit 923bdc7

File tree

2 files changed

+2
-39
lines changed

2 files changed

+2
-39
lines changed

.github/workflows/aggregate.yml

Lines changed: 2 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -28,41 +28,5 @@ jobs:
2828
2929
- name: Run repository aggregation script
3030
run: |
31-
set -xeuo pipefail
32-
33-
REPOS_FILE="README.org"
34-
LOCK_FILE="repositories.lock"
35-
REPOS_DIR="repos" # if changed, also remember to change in $REPOS_FILE
36-
37-
# PURGE!!
38-
rm -rf "$REPOS_DIR"
39-
mkdir -p "$REPOS_DIR"
40-
rm -f "$LOCK_FILE"
41-
42-
# the `||` is for when there's no trailing new line, but we still have content in the last line
43-
while IFS='|' read -r first dir url branch _ || [[ -n "$first" ]]; do
44-
# empty lines and comments allowed
45-
[[ -z "$dir" || "$first" == \#* ]] && continue
46-
47-
# echo with no " to strip whitespace
48-
dir=$(echo $dir | tr -d "[]")
49-
url=$(echo $url)
50-
branch=$(echo $branch)
51-
52-
mkdir -p "$dir"
53-
git clone --depth 1 --no-tags --branch "$branch" "$url" "$dir"
54-
55-
hash=$(git -C "$dir" rev-parse HEAD)
56-
echo "$dir $hash" >> "$LOCK_FILE"
57-
58-
rm -rf "$dir/.git"
59-
done <<< $(sed -n '/# BEGIN REPOLIST/,/# END REPOLIST/{//!p}' "$REPOS_FILE")
60-
61-
last_update=$(git log -1 --format=%cd --date=short 2>/dev/null || echo "initial")
62-
current_date=$(date +%Y-%m-%d)
63-
commit_title="Update repositories: $last_update to $current_date"
64-
commit_body="$(git diff --word-diff HEAD -- "$LOCK_FILE" | tail -n +6)"
65-
66-
git add .
67-
git commit --quiet -m "$commit_title" -m "$commit_body" || true
68-
git push origin HEAD
31+
chmod +x ./aggregate.sh
32+
./aggregate.sh

README.org

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ your dotfiles instead, also please, PRs are welcome.
99
* repositories
1010
# BEGIN REPOLIST
1111
| [[repos/aemogie/aetheria]] | https://github.com/aemogie/aetheria.git | dev |
12-
| [[repos/aemogie/aetheria]] | https://github.com/aemogie/aetheria.git | dev |
1312
| [[repos/abcdw/rde]] | https://git.sr.ht/~abcdw/rde | master |
1413
| [[repos/anemofilia/zero]] | https://codeberg.org/anemofilia/zero.git | main |
1514
| [[repos/look/misako]] | https://codeberg.org/look/misako.git | main |

0 commit comments

Comments
 (0)