Skip to content

Commit

Permalink
Merge pull request #86 from atlas-bi/dev
Browse files Browse the repository at this point in the history
  • Loading branch information
christopherpickering authored May 8, 2023
2 parents 5f9609e + 645fbd6 commit fc18dc5
Show file tree
Hide file tree
Showing 11 changed files with 1,001 additions and 456 deletions.
11 changes: 8 additions & 3 deletions .github/workflows/codespell.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
name: Codespell
name: ✔️ Codespell

on:
pull_request:

jobs:
check:
runs-on: ubuntu-latest
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
steps:
- name: Codespell action
- name: 💾 Checkout
uses: actions/checkout@v3
- name: ✔️ Codespell
uses: codespell-project/actions-codespell@master
with:
skip: '*.min.js'
skip: package-lock.json, *.lock, *.min.*
18 changes: 11 additions & 7 deletions .github/workflows/test.yml → .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,29 @@
name: lint
name: 🔍 lint
on: [push, pull_request]

jobs:
lint:
runs-on: ubuntu-latest
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

steps:
- name: Checkout
- name: 💾 Checkout
uses: actions/checkout@v3

- name: install python
- name: 🐍 Setup Python
uses: actions/setup-python@v4
with:
python-version: '3.10'

- name: Setup Poetry
- name: 🎶 Setup Poetry
uses: snok/install-poetry@v1

- name: Install
- name: 📥 Install
run: |
poetry install
- name: run lint
- name: 🔍 Lint
run: |
poetry run tox -e lint
poetry run tox -e lint
30 changes: 20 additions & 10 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,41 @@
name: Release
name: 🚀 Release

on:
push:
branches-ignore:
- dev
branches: [master, alpha]

jobs:
release:
runs-on: ubuntu-latest

steps:
- name: Checkout
- name: 💾 Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0
persist-credentials: false

- name: Setup Poetry
- name: ⎔ Setup node
uses: actions/setup-node@v3
with:
node-version: 18

- name: 📥 Download deps
uses: bahmutov/npm-install@v1
with:
useLockFile: false

- name: 🐍 Setup Python
uses: actions/setup-python@v4
with:
python-version: '3.10'

- name: 🎶 Setup Poetry
uses: snok/install-poetry@v1

- name: Semantic Release
- name: 🚀 Semantic Release
uses: cycjimmy/semantic-release-action@v3
with:
semantic_version: 18
extra_plugins: |
@semantic-release/changelog@6
@semantic-release/exec
@semantic-release/git@10
env:
GITHUB_TOKEN: ${{ secrets.RELEASE_PAT }}
24 changes: 15 additions & 9 deletions .github/workflows/update.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Sync Updates
name: Sync Updates
on:
push:
branches:
Expand All @@ -10,15 +10,18 @@ jobs:
runs-on: ubuntu-latest
if: github.ref_name == 'dev'
steps:
- uses: actions/checkout@v3
- name: 💾 Checkout
uses: actions/checkout@v3
with:
ref: alpha
- name: Reset promotion branch

- name: 🛑 Reset promotion branch
run: |
git fetch origin ${{github.ref_name}}:${{github.ref_name}}
git reset --hard ${{github.ref_name}}
- name: Create Pull Request
uses: peter-evans/[email protected]
- name: 🆕 Create Pull Request
uses: peter-evans/[email protected]
with:
labels: automated pr
branch: ${{github.ref_name}}
Expand All @@ -28,15 +31,18 @@ jobs:
runs-on: ubuntu-latest
if: github.ref_name == 'alpha'
steps:
- uses: actions/checkout@v3
- name: 💾 Checkout
uses: actions/checkout@v3
with:
ref: master
- name: Reset promotion branch

- name: 🛑 Reset promotion branch
run: |
git fetch origin ${{github.ref_name}}:${{github.ref_name}}
git reset --hard ${{github.ref_name}}
- name: Create Pull Request
uses: peter-evans/[email protected]
- name: 🆕 Create Pull Request
uses: peter-evans/[email protected]
with:
labels: automated pr
branch: ${{github.ref_name}}
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ repos:
- --remove-duplicate-keys
- --remove-unused-variables
- repo: https://github.com/asottile/pyupgrade
rev: v3.3.1
rev: v3.3.2
hooks:
- id: pyupgrade
args: [--py36-plus]
Expand Down
2 changes: 1 addition & 1 deletion main.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
else ""
)
+ "*/\n\n"
+ (childnode.text)
+ (childnode.text or "")
)
this_conn["ReportId"] = (
tree.getroot().find("repository-location").get("id")
Expand Down
Loading

0 comments on commit fc18dc5

Please sign in to comment.