diff --git a/.github/workflow_data/webhook.py b/.github/workflow_data/webhook.py index aca529c6c9..b9a03a0359 100644 --- a/.github/workflow_data/webhook.py +++ b/.github/workflow_data/webhook.py @@ -43,50 +43,6 @@ url = event["compare"] color = 16723712 if event["forced"] else 3669797 - # case "pull_request": - # pr = event["pull_request"] - # url = pr["html_url"] - # branch = pr["base"]["ref"] + ( - # "" - # if pr["base"]["repo"]["full_name"] != pr["head"]["repo"]["full_name"] - # else f" <- {pr['head']['ref']}" - # ) - # name = pr["title"][:50] + ("..." if len(pr["title"]) > 50 else "") - # title = f"Pull Request {event['action'].title()} ({branch}): {name}" - # match event["action"]: - # case "opened": - # desc = (pr["body"][:2045] + "...") if len(pr["body"]) > 2048 else pr["body"] - # color = 3669797 - - # fields.append( - # { - # "name": "Changed Files:", - # "value": str(pr["changed_files"]), - # "inline": True, - # } - # ) - # fields.append( - # { - # "name": "Added:", - # "value": "+" + str(pr["additions"]), - # "inline": True, - # } - # ) - # fields.append( - # { - # "name": "Removed:", - # "value": "-" + str(pr["deletions"]), - # "inline": True, - # } - # ) - - # case "closed": - # color = 16723712 - # case "reopened": - # color = 16751872 - # case _: - # sys.exit(1) - case "release": match event["action"]: case "published": diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8c37c5b5aa..4a6af091fc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ env: FBT_GIT_SUBMODULE_SHALLOW: 1 jobs: - main: + build: runs-on: ubuntu-latest strategy: fail-fast: false diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index e6e53ee016..bb058d07cb 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -1,4 +1,4 @@ -name: 'Generate documentation with Doxygen' +name: "Docs" on: push: @@ -10,21 +10,21 @@ env: DEFAULT_TARGET: f7 jobs: - doxygen: + docs: if: ${{ !github.event.pull_request.head.repo.fork }} runs-on: ubuntu-latest steps: - - name: 'Wipe workspace' + - name: "Wipe workspace" run: find ./ -mount -maxdepth 1 -exec rm -rf {} \; - - name: 'Checkout code' + - name: "Checkout code" uses: actions/checkout@v4 with: submodules: true fetch-depth: 1 ref: ${{ github.event.pull_request.head.sha }} - - name: 'Get commit details' + - name: "Get commit details" id: names run: | if [[ ${{ github.event_name }} == 'pull_request' ]]; then @@ -36,13 +36,13 @@ jobs: fi python3 scripts/get_env.py "--event_file=${{ github.event_path }}" "--type=$TYPE" - - name: 'Generate documentation' + - name: "Generate documentation" uses: mattnotmitt/doxygen-action@v1.9.8 with: - working-directory: 'documentation/' - doxyfile-path: './doxygen/Doxyfile-awesome.cfg' + working-directory: "documentation/" + doxyfile-path: "./doxygen/Doxyfile-awesome.cfg" - - name: 'Upload documentation' + - name: "Upload documentation" uses: jakejarvis/s3-sync-action@v0.5.1 env: AWS_S3_BUCKET: "${{ secrets.FW_DOCS_AWS_BUCKET }}" @@ -53,4 +53,3 @@ jobs: DEST_DIR: "${{steps.names.outputs.branch_name}}" with: args: "--delete" - diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index f2aab96c89..0fd4af0085 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -4,7 +4,6 @@ on: push: branches: - dev - - main tags: - "*" pull_request: diff --git a/.github/workflows/webhook.yml b/.github/workflows/webhook.yml index 4ad738611f..1925517253 100644 --- a/.github/workflows/webhook.yml +++ b/.github/workflows/webhook.yml @@ -2,11 +2,6 @@ name: "Webhook" on: push: - # pull_request: - # types: - # - "opened" - # - "closed" - # - "reopened" release: types: - "published" diff --git a/scripts/version.py b/scripts/version.py index 84294acc0f..bf2777a2d1 100755 --- a/scripts/version.py +++ b/scripts/version.py @@ -35,11 +35,7 @@ def get_version_info(self): or "unknown" ) - version = ( - self.suffix - or os.environ.get("DIST_SUFFIX", None) - or "unknown" - ) + version = self.suffix or os.environ.get("DIST_SUFFIX", None) or "unknown" if "SOURCE_DATE_EPOCH" in os.environ: commit_date = datetime.utcfromtimestamp(