Skip to content

Commit

Permalink
Merge branch 'refs/heads/upstream'
Browse files Browse the repository at this point in the history
# Conflicts:
#	README-CN.md
#	README.md
  • Loading branch information
ben-29 committed Feb 7, 2025
2 parents e32fa8d + aee4ed5 commit eb81206
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ jobs:
pip install -r requirements-dev.txt
- name: Check formatting (black)
run: black . --check
run: black . --diff --color && black . --check
6 changes: 6 additions & 0 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ jobs:
url: ${{ steps.deployment.outputs.page_url }}
# The type of runner that the job will run on
runs-on: ubuntu-latest
permissions:
id-token: write
pages: write

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
Expand Down Expand Up @@ -99,7 +102,10 @@ jobs:
uses: actions/upload-pages-artifact@v3
with:
# Upload dist repository
name: pages-artifact
path: './dist'
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
with:
artifact_name: pages-artifact
6 changes: 3 additions & 3 deletions .github/workflows/run_data_sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -220,14 +220,14 @@ jobs:
- name: Save data to parqent
if: env.SAVE_TO_PARQENT == 'true'
run: |
pip install duckdb
pip install duckdb==1.1.0
python run_page/save_to_parqent.py
- name: Push new runs
if: env.SAVE_DATA_IN_GITHUB_CACHE != 'true'
run: |
git config --local user.email "${{ env.GITHUB_EMAIL }}"
git config --local user.name "${{ env.GITHUB_NAME }}"
git config --local user.email "action@github.com"
git config --local user.name "GitHub Action"
git add .
git commit -m 'Add new workouts' || echo "nothing to commit"
git push || echo "nothing to push"
Expand Down
3 changes: 3 additions & 0 deletions run_page/gpxtrackposter/exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,17 @@

class PosterError(Exception):
"Base class for all errors"

pass


class TrackLoadError(PosterError):
"Something went wrong when loading a track file, we just ignore this file and continue"

pass


class ParameterError(PosterError):
"Something's wrong with user supplied parameters"

pass

0 comments on commit eb81206

Please sign in to comment.