Skip to content

Commit

Permalink
Merge branch 'main' of github.com:felt/qgis-plugin into dane/fix-copy…
Browse files Browse the repository at this point in the history
…-in-auth-dialog
  • Loading branch information
springmeyer committed Mar 6, 2024
2 parents 07d0c16 + 3e7ed66 commit 681f7a1
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 6 deletions.
19 changes: 14 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,13 @@ jobs:

steps:
- name: Get source code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
# To fetch tags
fetch-depth: 0

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.10"
cache: "pip"
Expand All @@ -26,13 +29,19 @@ jobs:
- name: Install Python requirements
run: pip install -r requirements/packaging.txt

- name: Set plugin version environment variables
run: |
TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
echo "VERSION=$(echo ${TAG} | awk -F. -v OFS=. 'NF==1{print ++$NF}; NF>1{if(length($NF+1)>length($NF))$(NF-1)++; $NF=sprintf("%0*d", length($NF), ($NF+1)%(10^length($NF))); print}')-alpha" >> $GITHUB_ENV
echo "SHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
- name: Build package
run: |
qgis-plugin-ci package dev-${GITHUB_SHA}
qgis-plugin-ci --no-validation package ${{ env.VERSION }}
mkdir tmp
unzip felt.dev-${GITHUB_SHA}.zip -d tmp
unzip felt.${{ env.VERSION }}.zip -d tmp
- uses: actions/upload-artifact@v2
with:
name: felt_plugin
name: felt_plugin.${{ env.VERSION }}.${{ env.SHA_SHORT }}
path: tmp
2 changes: 1 addition & 1 deletion felt/test/test_recent_projects_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def test_pretty_date(self):
self.assertEqual(model.pretty_format_date(two_weeks_ago),
"2 weeks ago")

one_month_ago = now.addMonths(-1)
one_month_ago = now.addDays(-35)
self.assertEqual(model.pretty_format_date(one_month_ago),
"1 month ago")

Expand Down

0 comments on commit 681f7a1

Please sign in to comment.