Compare commits

..

6 Commits

Author SHA1 Message Date
153a4f5342 Update .gitea/workflows/release.yml
Some checks failed
Build Docker / Create Docker Image (release) Successful in 6m17s
Release / Tag release (push) Successful in 2m0s
Release / Create Release (push) Successful in 34s
Release / Publish Docker Images (push) Failing after 7m31s
Snyk / security (push) Successful in 11m38s
2025-05-10 22:28:54 +02:00
0202619cb8 fix(ci): fix release workflow (#351)
All checks were successful
Snyk / security (push) Successful in 2m36s
Reviewed-on: #351
2025-05-10 21:59:18 +02:00
c64b2b71ac chore(deps): update astral-sh/setup-uv action to v6 (#350)
All checks were successful
Snyk / security (push) Successful in 2m54s
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [astral-sh/setup-uv](https://github.com/astral-sh/setup-uv) | action | major | `v5` -> `v6` |

---

### Release Notes

<details>
<summary>astral-sh/setup-uv (astral-sh/setup-uv)</summary>

### [`v6`](https://github.com/astral-sh/setup-uv/compare/v5...v6)

[Compare Source](https://github.com/astral-sh/setup-uv/compare/v5...v6)

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MC43LjAiLCJ1cGRhdGVkSW5WZXIiOiI0MC43LjAiLCJ0YXJnZXRCcmFuY2giOiJtYWluIiwibGFiZWxzIjpbInR5cGUvZGVwZW5kZW5jaWVzIl19-->

Reviewed-on: #350
Co-authored-by: Renovate [BOT] <renovate-bot@git.tainton.uk>
Co-committed-by: Renovate [BOT] <renovate-bot@git.tainton.uk>
2025-05-07 08:37:15 +02:00
fa9ea8eafb chore(deps): lock file maintenance (#348)
All checks were successful
Snyk / security (push) Successful in 2m7s
This PR contains the following updates:

| Update | Change |
|---|---|
| lockFileMaintenance | All locks refreshed |

🔧 This Pull Request updates lock files to use the latest dependency versions.

---

### Configuration

📅 **Schedule**: Branch creation - "before 4am on monday" (UTC), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://github.com/renovatebot/renovate/discussions) if that's undesired.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4yNjEuNCIsInVwZGF0ZWRJblZlciI6IjM5LjI2MS40IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJ0eXBlL2RlcGVuZGVuY2llcyJdfQ==-->

Co-authored-by: Luke Tainton <luke@tainton.uk>
Reviewed-on: #348
Co-authored-by: Renovate [BOT] <renovate-bot@git.tainton.uk>
Co-committed-by: Renovate [BOT] <renovate-bot@git.tainton.uk>
2025-05-07 01:42:51 +02:00
d5dd7907fb Update .gitea/workflows/release.yml
All checks were successful
Snyk / security (push) Successful in 2m18s
2025-05-07 01:32:03 +02:00
fd8d04c89d chore(deps): update sonarsource/sonarqube-scan-action action to v5.2.0 (#349)
All checks were successful
Snyk / security (push) Successful in 3m14s
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [SonarSource/sonarqube-scan-action](https://github.com/SonarSource/sonarqube-scan-action) | action | minor | `v5.1.0` -> `v5.2.0` |

---

### Release Notes

<details>
<summary>SonarSource/sonarqube-scan-action (SonarSource/sonarqube-scan-action)</summary>

### [`v5.2.0`](https://github.com/SonarSource/sonarqube-scan-action/releases/tag/v5.2.0)

[Compare Source](https://github.com/SonarSource/sonarqube-scan-action/compare/v5.1.0...v5.2.0)

##### What's Changed

-   SQSCANGHA-90 remove mend dead conf by [@&#8203;pierre-guillot-gh](https://github.com/pierre-guillot-gh) in https://github.com/SonarSource/sonarqube-scan-action/pull/184
-   SQSCANGHA-89 Attempt to fix command injection by [@&#8203;henryju](https://github.com/henryju) in https://github.com/SonarSource/sonarqube-scan-action/pull/186
-   SQSCANGHA-93 Fix madhead/semver-utils' version by [@&#8203;csaba-feher-sonarsource](https://github.com/csaba-feher-sonarsource) in https://github.com/SonarSource/sonarqube-scan-action/pull/187
-   SQSCANGHA-94 Update version update logic by [@&#8203;csaba-feher-sonarsource](https://github.com/csaba-feher-sonarsource) in https://github.com/SonarSource/sonarqube-scan-action/pull/188
-   SQSCANGHA-92 Validate scanner version by [@&#8203;csaba-feher-sonarsource](https://github.com/csaba-feher-sonarsource) in https://github.com/SonarSource/sonarqube-scan-action/pull/189

**Full Changelog**: https://github.com/SonarSource/sonarqube-scan-action/compare/v5...v5.2.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MC4wLjkiLCJ1cGRhdGVkSW5WZXIiOiI0MC4wLjkiLCJ0YXJnZXRCcmFuY2giOiJtYWluIiwibGFiZWxzIjpbInR5cGUvZGVwZW5kZW5jaWVzIl19-->

Reviewed-on: #349
Co-authored-by: Renovate [BOT] <renovate-bot@git.tainton.uk>
Co-committed-by: Renovate [BOT] <renovate-bot@git.tainton.uk>
2025-05-06 23:53:23 +02:00
3 changed files with 99 additions and 75 deletions

View File

@ -56,7 +56,7 @@ jobs:
run: uv cache prune --ci run: uv cache prune --ci
- name: SonarQube Scan - name: SonarQube Scan
uses: SonarSource/sonarqube-scan-action@v5.1.0 uses: SonarSource/sonarqube-scan-action@v5.2.0
env: env:
SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST_URL }} SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST_URL }}
SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }} SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }}

View File

@ -2,93 +2,117 @@ name: Release
on: on:
workflow_dispatch: workflow_dispatch:
schedule: schedule:
- cron: "0 9 * * 0" - cron: '0 9 * * 0'
jobs: jobs:
test: # test:
name: Test # name: Test
uses: https://git.tainton.uk/repos/roboluke/.gitea/workflows/ci.yml@main # uses: https://git.tainton.uk/${{ gitea.repository }}/.gitea/workflows/ci.yml@main
with:
python-version: 3.13
secrets:
SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST_URL }}
SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }}
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
# create_release: tag:
# name: Create Release name: Tag release
# needs: test uses: https://git.tainton.uk/actions/gha-workflows/.gitea/workflows/release-with-tag.yaml@main
# uses: https://git.tainton.uk/actions/gha-workflows/.gitea/workflows/create-release.yml@main
# secrets:
# ACTIONS_TOKEN: ${{ secrets.ACTIONS_TOKEN }}
create_release: create_release:
name: Create Release name: Create Release
needs: tag
uses: https://git.tainton.uk/actions/gha-workflows/.gitea/workflows/create-release-preexisting-tag.yaml@main
with:
tag: ${{ needs.tag.outputs.tag_name }}
body: ${{ needs.tag.outputs.changelog }}
secrets:
ACTIONS_TOKEN: ${{ secrets.ACTIONS_TOKEN }}
# get_release_id:
# name: Get Release ID
# runs-on: ubuntu-latest
# needs: create_release
# outputs:
# releaseid: ${{ steps.getid.outputs.releaseid }}
# steps:
# - name: Get Release ID
# id: getid
# run: |
# rid=$(curl -s -X 'GET' \
# -H 'accept: application/json' \
# '${{ gitea.server_url }}/api/v1/repos/${{ gitea.repository }}/releases/latest' | jq -r '.id')
# echo "releaseid=$rid" >> "$GITEA_OUTPUT"
# echo "$rid"
create_docker:
name: Publish Docker Images
runs-on: ubuntu-latest runs-on: ubuntu-latest
# needs: test needs: [tag, create_release]
outputs:
release_name: ${{ steps.get_next_version.outputs.tag }}
steps: steps:
- name: Update Docker configuration
continue-on-error: true
run: |
mkdir -p /etc/default
mkdir -p /etc/docker
touch -a /etc/default/docker
touch -a /etc/docker/daemon.json
echo "DOCKER_OPTS=\"--insecure-registry ${{ vars.PACKAGES_REGISTRY_URL }}\"" >> /etc/default/docker
echo "{\"insecure-registries\": [\"${{ vars.PACKAGES_REGISTRY_URL }}\"]}" > /etc/docker/daemon.json
- name: Get repo name
id: split
run: echo "repo=${REPO##*/}" >> "$GITEA_OUTPUT"
env:
REPO: ${{ gitea.repository }}
- name: Check out repository - name: Check out repository
uses: actions/checkout@v4.2.2 uses: actions/checkout@v4.2.2
with: with:
fetch-depth: 0 fetch-depth: 0
ref: ${{ needs.tag.outputs.tag_name }}
- name: Changes since last tag - name: Set up Docker Buildx
id: changes uses: docker/setup-buildx-action@v3
run: |
rm -f .changes
git log $(git describe --tags --abbrev=0)..HEAD --no-merges --oneline >> .changes
cat .changes
- name: Check for changes - name: Log in to Gitea Container Registry
run: | uses: docker/login-action@v3
if [[ -z $(grep '[^[:space:]]' .changes) ]] ; then
echo "changes=false"
echo "changes=false" >> "$GITEA_OUTPUT"
else
echo "changes=true"
echo "changes=true" >> "$GITEA_OUTPUT"
fi
- name: Cancel if no changes
if: steps.changes.outputs.changes == 'false'
run: exit 1
- name: Set server URL
id: set_srvurl
run: |
SRVURL=$(echo "${{ gitea.server_url }}" | sed 's/https:\/\/\(.*\)/\1/')
echo "srvurl=$SRVURL" >> "$GITEA_OUTPUT"
- name: Get next version
uses: TriPSs/conventional-changelog-action@v6
id: get_next_version
with: with:
git-url: ${{ steps.set_srvurl.outputs.srvurl }} registry: ${{ vars.PACKAGES_REGISTRY_URL }}
github-token: ${{ gitea.token }} username: ${{ vars.ACTIONS_USERNAME }}
preset: "conventionalcommits" password: ${{ secrets.ACTIONS_TOKEN }}
# preset: "angular" # This is the default
skip-commit: true
release-count: 1
output-file: false
create-summary: true
skip-on-empty: true
skip-version-file: true
skip-tag: true
- name: Create release - name: Log in to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ vars.GHCR_USERNAME }}
password: ${{ secrets.GHCR_TOKEN }}
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v5
with:
tags: type=semver,pattern=v{{version}},value=${{ needs.tag.outputs.tag_name }}
images: |
ghcr.io/${{ vars.GHCR_USERNAME }}/${{ steps.split.outputs.repo }}
${{ vars.PACKAGES_REGISTRY_URL }}/${{ gitea.repository }}
- name: Print metadata
run: | run: |
curl -s -X POST \ printf "Annotations:\n${{ steps.meta.outputs.annotations }}"
-H "Authorization: token ${{ secrets.ACTIONS_TOKEN }}" \ echo ""
-H "accept: application/json" \ printf "Labels:\n${{ steps.meta.outputs.labels }}"
-H "Content-Type: application/json" \ echo ""
-d "{\"tag_name\": \"${{ steps.get_next_version.outputs.tag }}\", \"name\": \"${{ steps.get_next_version.outputs.tag }}\", \"body\": \"${{ steps.get_next_version.outputs.changelog }}\"}" \ printf "Tags:\n${{ steps.meta.outputs.tags }}"
"${{ gitea.server_url }}/api/v1/repos/${{ gitea.repository }}/releases"
print_release: - name: Build images
name: Print Release uses: docker/build-push-action@v6
runs-on: ubuntu-latest with:
needs: create_release context: .
steps: push: false
- run: echo "Created release ${{ needs.create_release.outputs.release_name }}." load: true
annotations: ${{ steps.meta.outputs.annotations }}
labels: ${{ steps.meta.outputs.labels }}
tags: ${{ steps.meta.outputs.tags }}
- name: Push images
run: |
strtags="${{ steps.meta.outputs.tags }}"
readarray -t lines <<<"$strtags"
for element in "${lines[@]}"; do docker push "$element"; done
unset strtags lines

View File

@ -4,7 +4,7 @@ import logging
from webex_bot.models.command import Command from webex_bot.models.command import Command
from webex_bot.models.response import Response, response_from_adaptive_card from webex_bot.models.response import Response, response_from_adaptive_card
from webexteamssdk.models.cards import ( from webexpythonsdk.models.cards import (
AdaptiveCard, AdaptiveCard,
Column, Column,
ColumnSet, ColumnSet,
@ -14,7 +14,7 @@ from webexteamssdk.models.cards import (
Text, Text,
TextBlock, TextBlock,
) )
from webexteamssdk.models.cards.actions import Submit from webexpythonsdk.models.cards.actions import Submit
from app.utils.config import config from app.utils.config import config
from app.utils.n8n import get_tasks, submit_task from app.utils.n8n import get_tasks, submit_task