diff --git a/.github/workflows/fetch_all_tools.yaml b/.github/workflows/fetch_all_tools.yaml index 4bbfc5e8..ca0c96c8 100644 --- a/.github/workflows/fetch_all_tools.yaml +++ b/.github/workflows/fetch_all_tools.yaml @@ -50,6 +50,10 @@ jobs: bash bin/extract_all_tools.sh "${{ matrix.subset }}" env: GITHUB_API_KEY: ${{ secrets.GH_API_TOKEN }} + - name: Merge updates into results #s0/git-publish-subdir-action fails if there is a change on results while this job runs + run: | + cd results && + git pull --no-rebase -s recursive -X ours - name: Commit all tools uses: s0/git-publish-subdir-action@develop env: @@ -88,6 +92,10 @@ jobs: - name: Wordcloud and interactive table run: | bash bin/format_tools.sh + - name: Merge updates into results #s0/git-publish-subdir-action fails if there is a change on results while this job runs + run: | + cd results && + git pull --no-rebase -s recursive -X ours - name: Commit all tools # add or commit any changes in results if there was a change, merge with main and push as bot uses: s0/git-publish-subdir-action@develop diff --git a/.github/workflows/fetch_all_tutorials.yaml b/.github/workflows/fetch_all_tutorials.yaml index 85412d40..fb887d3d 100644 --- a/.github/workflows/fetch_all_tutorials.yaml +++ b/.github/workflows/fetch_all_tutorials.yaml @@ -40,6 +40,10 @@ jobs: bash bin/extract_all_tutorials.sh env: PLAUSIBLE_API_KEY: ${{ secrets.PLAUSIBLE_API_TOKEN }} + - name: Merge updates into results #s0/git-publish-subdir-action fails if there is a change on results while this job runs + run: | + cd results && + git pull --no-rebase -s recursive -X ours - name: Commit all tools uses: s0/git-publish-subdir-action@develop env: diff --git a/.github/workflows/filter_communities.yaml b/.github/workflows/filter_communities.yaml index 48455f90..38a83caf 100644 --- a/.github/workflows/filter_communities.yaml +++ b/.github/workflows/filter_communities.yaml @@ -46,6 +46,10 @@ jobs: - name: Run script run: | bash bin/get_community_tutorials.sh + - name: Merge updates into results #s0/git-publish-subdir-action fails if there is a change on results while this job runs + run: | + cd results && + git pull --no-rebase -s recursive -X ours - name: Commit results # commit the new filtered data, only if stuff was changed uses: s0/git-publish-subdir-action@develop @@ -78,6 +82,10 @@ jobs: - name: Run script run: | bash bin/update_tools_to_keep_exclude.sh + - name: Merge updates into results #s0/git-publish-subdir-action fails if there is a change on results while this job runs + run: | + cd results && + git pull --no-rebase -s recursive -X ours - name: Commit results # commit the new filtered data, only if stuff was changed uses: s0/git-publish-subdir-action@develop @@ -110,6 +118,10 @@ jobs: - name: Run script run: | bash bin/get_community_tools.sh + - name: Merge updates into results #s0/git-publish-subdir-action fails if there is a change on results while this job runs + run: | + cd results && + git pull --no-rebase -s recursive -X ours - name: Commit results # commit the new filtered data, only if stuff was changed uses: s0/git-publish-subdir-action@develop diff --git a/.github/workflows/utilities.yml b/.github/workflows/utilities.yml index 0e42d3fd..0edfcc50 100644 --- a/.github/workflows/utilities.yml +++ b/.github/workflows/utilities.yml @@ -36,6 +36,10 @@ jobs: - name: Run script run: | python bin/get_public_galaxy_servers.py -o results/available_public_servers.csv + - name: Merge updates into results #s0/git-publish-subdir-action fails if there is a change on results while this job runs + run: | + cd results && + git pull --no-rebase -s recursive -X ours - name: Commit servers uses: s0/git-publish-subdir-action@develop env: