Merge branch 'main' into updatechecker

This commit is contained in:
Seaswimmer 2024-01-07 02:15:10 +00:00
commit 3fb695b2e5
Signed by untrusted user: cswimr
GPG key ID: D74DDDDF420E13DF
2 changed files with 8 additions and 7 deletions

View file

@ -48,22 +48,22 @@ jobs:
- name: Deploy the documentation to Meli (CoastalCommits Pages) - name: Deploy the documentation to Meli (CoastalCommits Pages)
run: | run: |
if [ -n "${{ github.base_ref }}" ]; then if [ -n "${{ github.base_ref }}" ]; then
release="${{ github.base_ref }}" release="$(basename "{{ github.base_ref }}")"
export GITEA_TOKEN = ${{ secrets.COASTALCOMMITSTOKEN }}
else else
release="${{ github.ref }}" release="$(basename "${{ github.ref }}")"
fi fi
echo "Deploying to Meli on branch $release" echo "Deploying to Meli on branch $release"
npx -p "@getmeli/cli" meli upload ./site \ npx -p "@getmeli/cli" meli upload ./site \
--url "http://pages.coastalcommits.com" \ --url "https://pages.coastalcommits.com" \
--site "${{ variables.MELI_SITE }}" \ --site "${{ vars.MELI_SITE_ID }}" \
--token "${{ secrets.MELI_SITE_SECRET }}" \ --token "${{ secrets.MELI_SITE_SECRET }}" \
--release "$release" --release "$release/$(git rev-parse HEAD)" \
--branch "$release"
echo "Deployed to Meli on branch $release" echo "Deployed to Meli on branch $release"
env:
GITEA_TOKEN: ${{ secrets.COASTALCOMMITSTOKEN }}
continue-on-error: true continue-on-error: true
- name: Analysing the code with Pylint - name: Analysing the code with Pylint
run: | run: |

1
.gitignore vendored
View file

@ -1,2 +1,3 @@
.cache .cache
.vscode .vscode
site