Skip to content

Commit 7dbe6fb

Browse files
authored
Merge branch 'master' into hao/integration-actions
2 parents 2e71422 + e1a92a5 commit 7dbe6fb

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

.github/workflows/rsync-docker-bump.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Update Rsync Tag in Dockerfile
22

33
on:
4+
workflow_dispatch:
45
schedule:
56
- cron: '0 0 * * *' # Runs daily at 00:00
67

@@ -14,21 +15,20 @@ jobs:
1415

1516
- name: Get latest rsync tag
1617
id: latest_tag
17-
run: |
18-
curl --silent "https://api.github.com/repos/WayneD/rsync/tags" | jq -r '.[0].name' | xargs -I {} echo "::set-output name=latest_tag::{}"
18+
run: curl --silent "https://api.github.com/repos/WayneD/rsync/tags" | jq -r '.[].name' | grep -m1 -v pre | xargs -I {} echo "name=latest_tag::{}" >> "$GITHUB_OUTPUT"
1919

2020
- name: Update Dockerfile with latest tag
2121
run: |
2222
sed -i -E "s/RSYNC_TAG=[0-9\.]+/RSYNC_TAG=${{ steps.latest_tag.outputs.latest_tag }}/g" Dockerfile
2323
2424
- name: Create Pull Request for tag update
25-
uses: peter-evans/create-pull-request@v3
25+
uses: peter-evans/create-pull-request@v5
2626
with:
2727
token: ${{ secrets.GITHUB_TOKEN }}
2828
commit-message: "Update rsync tag in Dockerfile"
2929
title: "Update rsync tag in Dockerfile"
3030
body: "This PR updates the rsync tag in the Dockerfile to the latest tagged version."
3131
branch: "update-rsync-tag"
3232
base: "master"
33-
path: "."
33+
add-paths: "Dockerfile"
3434
labels: "automated-update,rsync"

backup.config-example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ GHE_NUM_SNAPSHOTS=10
2626
# performed before the next full backup is created.
2727
# For example, if `GHE_INCREMENTAL_BACKUP_MAX` is set to 14, backup-utils will
2828
# run 1 full backup and then 13 incremental backups before performing another full backup on the next cycle.
29-
#GHE_INCREMENTAL_BACKUP_MAX=14
29+
#GHE_INCREMENTAL_MAX_BACKUPS=14
3030

3131
# If GHE_SKIP_CHECKS is set to true (or if --skip-checks is used with ghe-backup) then ghe-host-check
3232
# disk space validation and software version checks on the backup-host will be disabled.

test/testlib.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@ setup_remote_metadata () {
8787
mkdir -p "$GHE_REMOTE_DATA_DIR" "$GHE_REMOTE_DATA_USER_DIR"
8888
mkdir -p "$GHE_REMOTE_DATA_USER_DIR/common"
8989
mkdir -p "$GHE_REMOTE_ROOT_DIR/etc/github"
90+
# Create fake remote repositories dir
91+
mkdir -p "$GHE_REMOTE_DATA_USER_DIR/repositories"
9092
}
9193
setup_remote_metadata
9294

0 commit comments

Comments
 (0)