From fcdf46b7b8a600a44fdd3857821295e01f095f78 Mon Sep 17 00:00:00 2001 From: Eric Theise Date: Mon, 8 Jul 2024 13:34:39 -0700 Subject: [PATCH] Part of https://github.com/OpenHistoricalMap/issues/issues/786, adjusting workflow. --- .github/workflows/ohm.upstream-sync.yml | 14 ++++++++++---- scripts/upstream_sync.sh | 1 - 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ohm.upstream-sync.yml b/.github/workflows/ohm.upstream-sync.yml index 45a5f17a..46bd0342 100644 --- a/.github/workflows/ohm.upstream-sync.yml +++ b/.github/workflows/ohm.upstream-sync.yml @@ -15,11 +15,17 @@ jobs: run: shell: bash steps: - - name: Check out the repository to the runner + - name: Check out our repository to the runner uses: actions/checkout@v4 - with: - fetch-depth: 2 - - name: Make the script files executable + - name: Check out the upstream repository to the runner + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + UPSTREAM: https://github.com/tyrasd/overpass-turbo + run: | + git config --global user.name "github-actions" + git config --global user.email "github-actions@users.noreply.github.com" + git remote add upstream "${UPSTREAM}" + - name: Make our script executable run: chmod +x ./scripts/upstream_sync.sh - name: Run sync script run: ./scripts/upstream_sync.sh diff --git a/scripts/upstream_sync.sh b/scripts/upstream_sync.sh index b91d9743..4b6f09e4 100755 --- a/scripts/upstream_sync.sh +++ b/scripts/upstream_sync.sh @@ -7,7 +7,6 @@ git checkout main git branch -D the-sacrifice git checkout -b the-sacrifice -git remote add upstream git@github.com:tyrasd/overpass-turbo.git git fetch upstream master mkdir upstream