Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge updates into results to avoid divergent branches #163

Closed
wants to merge 2 commits into from
Closed

Merge updates into results to avoid divergent branches #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78f5eca
try to merge results first
paulzierep Aug 12, 2024
7e14f03
add merge for all jobs
paulzierep Aug 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/workflows/fetch_all_tools.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/fetch_all_tutorials.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/filter_communities.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/utilities.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading