diff --git a/.github/workflows/ohm.upstream-sync.yml b/.github/workflows/ohm.upstream-sync.yml index 46bd0342..6b44e082 100644 --- a/.github/workflows/ohm.upstream-sync.yml +++ b/.github/workflows/ohm.upstream-sync.yml @@ -15,9 +15,9 @@ jobs: run: shell: bash steps: - - name: Check out our repository to the runner + - name: Check out our repository uses: actions/checkout@v4 - - name: Check out the upstream repository to the runner + - name: Check out the upstream repository env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} UPSTREAM: https://github.com/tyrasd/overpass-turbo diff --git a/scripts/upstream_sync.sh b/scripts/upstream_sync.sh index 553a59af..39346248 100755 --- a/scripts/upstream_sync.sh +++ b/scripts/upstream_sync.sh @@ -21,20 +21,20 @@ if [ -n "$(git status --porcelain)" ]; then git commit -m 'Preserving upstream markdown & text files.' fi -git merge --no-ff --no-commit upstream/master -concerns=('js/ide.js' 'js/map.ts') -for i in $(git diff --name-only --diff-filter=U --relative);do - echo "$i" - for c in "${concerns[@]}";do - echo "$c" - if [[ $i != $c ]];then - git checkout --theirs -- $i - git add $i - fi - done -done - -if [ -n "$(git status --porcelain)" ]; then - iso=$(date -Iminutes) - git commit -m "Merge upstream ("$iso")." -fi +#git merge --no-ff --no-commit upstream/master +#concerns=('js/ide.js' 'js/map.ts') +#for i in $(git diff --name-only --diff-filter=U --relative);do +# echo "$i" +# for c in "${concerns[@]}";do +# echo "$c" +# if [[ $i != $c ]];then +# git checkout --theirs -- $i +# git add $i +# fi +# done +#done +# +#if [ -n "$(git status --porcelain)" ]; then +# iso=$(date -Iminutes) +# git commit -m "Merge upstream ("$iso")." +#fi