From eb223d37ef5ae20b85fd6d96876c80dc1b2a5b88 Mon Sep 17 00:00:00 2001 From: Dmitry Baev Date: Thu, 18 Jan 2024 10:55:56 +0000 Subject: [PATCH] workflow updates (via #834) --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/labeler.yml | 14 ++++++++++---- .github/release-drafter.yml | 28 ---------------------------- .github/release.yml | 25 +++++++++++++++++++++++++ .github/workflows/build.yml | 4 ++-- .github/workflows/lint.yml | 4 ++-- .github/workflows/publish.yml | 4 ++-- .github/workflows/release-draft.yml | 14 -------------- .github/workflows/release.yml | 14 +++++++------- LICENSE.txt => LICENSE | 2 +- 10 files changed, 50 insertions(+), 61 deletions(-) delete mode 100644 .github/release-drafter.yml create mode 100644 .github/release.yml delete mode 100644 .github/workflows/release-draft.yml rename LICENSE.txt => LICENSE (99%) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 8178c9b61..cc5b48b61 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -20,4 +20,4 @@ Describe the problem or feature in addition to a link to the issues - [ ] [Sign Allure CLA][cla] - [ ] Provide unit tests -[cla]: https://cla-assistant.io/accept/allure-framework/allure2 +[cla]: https://cla-assistant.io/accept/allure-framework/allure-js diff --git a/.github/labeler.yml b/.github/labeler.yml index 8f1ca3847..e475a497e 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -11,12 +11,18 @@ - "tsconfig.json" - ".husky/**" -"theme:decorators": - - "packages/allure-decorators/**" +"theme:codeceptjs": + - "packages/allure-codeceptjs/**" "theme:cucumberjs": - "packages/allure-cucumberjs/**" +"theme:decorators": + - "packages/allure-decorators/**" + +"theme:hermione": + - "packages/allure-hermione/**" + "theme:jasmine": - "packages/allure-jasmine/**" @@ -32,8 +38,8 @@ "theme:playwright": - "packages/allure-playwright/**" -"theme:codeceptjs": - - "packages/allure-codeceptjs/**" +"theme:vitest": + - "packages/allure-vitest/**" "theme:newman": - "packages/newman-reporter-allure/**" diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml deleted file mode 100644 index 3d2460c22..000000000 --- a/.github/release-drafter.yml +++ /dev/null @@ -1,28 +0,0 @@ -name-template: '$NEXT_MINOR_VERSION' -tag-template: '$NEXT_MINOR_VERSION' -categories: - - title: '🚀 New Features' - labels: - - 'type:new feature' - - title: '🔬 Improvements' - labels: - - 'type:improvement' - - title: '🐞 Bug Fixes' - labels: - - 'type:bug' - - title: '⬆️ Dependency Updates' - labels: - - 'type:dependencies' - - title: '📝 Docs Update' - labels: - - 'type:docs' - -change-template: '* $TITLE (via #$NUMBER) - @$AUTHOR' -exclude-labels: - - 'type:internal' -template: | - $CHANGES - - ## 👀 Links - - [Commits since $PREVIOUS_TAG](https://github.com/allure-framework/allure-js/compare/$PREVIOUS_TAG...master) diff --git a/.github/release.yml b/.github/release.yml new file mode 100644 index 000000000..7c30a5979 --- /dev/null +++ b/.github/release.yml @@ -0,0 +1,25 @@ +# release.yml + +changelog: + categories: + - title: '🚀 New Features' + labels: + - 'type:new feature' + - title: '🔬 Improvements' + labels: + - 'type:improvement' + - title: '🐞 Bug Fixes' + labels: + - 'type:bug' + - title: '⬆️ Dependency Updates' + labels: + - 'type:dependencies' + - title: '📖 Documentation improvements' + labels: + - 'type:documentation' + - title: '⛔️ Security' + labels: + - 'type:security' + - title: '👻 Internal changes' + labels: + - 'type:internal' diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a1f499bd2..db9d044c1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: matrix: node-version: [16, 18, 20] steps: - - uses: actions/checkout@v4.1.1 + - uses: actions/checkout@v4 - uses: browser-actions/setup-chrome@v1 with: @@ -30,7 +30,7 @@ jobs: ${{ steps.setup-chrome.outputs.chrome-path }} --version - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} cache: "yarn" diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index f77c1f887..3227facc4 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -19,9 +19,9 @@ jobs: matrix: node-version: [ 16 ] steps: - - uses: actions/checkout@v4.1.1 + - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} cache: "yarn" diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 150f5b987..4c8a858d6 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -8,8 +8,8 @@ jobs: publish: runs-on: ubuntu-latest steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: 16 registry-url: 'https://registry.npmjs.org' diff --git a/.github/workflows/release-draft.yml b/.github/workflows/release-draft.yml deleted file mode 100644 index 7778010c7..000000000 --- a/.github/workflows/release-draft.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: Release Draft - -on: - push: - branches: - - master - -jobs: - update_draft_release: - runs-on: ubuntu-latest - steps: - - uses: toolmantim/release-drafter@v5.21.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 643b9d93a..c3adc8aa7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: run: | expr "${{ github.event.inputs.releaseVersion }}" : '\(^[1-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\(-beta\.[1-9][0-9]*\)\{0,1\}\)$' - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + - uses: actions/checkout@v4 with: token: ${{ secrets.QAMETA_CI }} @@ -25,7 +25,7 @@ jobs: git config --global user.name qameta-ci git config --global user.email qameta-ci@qameta.io - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 16 cache: 'yarn' @@ -47,11 +47,11 @@ jobs: git push origin ${GITHUB_REF} - name: "Publish Github Release" - uses: toolmantim/release-drafter@v5.21.1 + uses: octokit/request-action@v2 with: - name: ${{ github.event.inputs.releaseVersion }} - version: ${{ github.event.inputs.releaseVersion }} - tag: v${{ github.event.inputs.releaseVersion }} - publish: "true" + route: POST /repos/${{ github.repository }}/releases + tag_name: ${{ github.event.inputs.releaseVersion }} + generate_release_notes: true + target_commitish: ${{ github.ref }} env: GITHUB_TOKEN: ${{ secrets.QAMETA_CI }} diff --git a/LICENSE.txt b/LICENSE similarity index 99% rename from LICENSE.txt rename to LICENSE index 3bffd11c7..aa0c10ae1 100644 --- a/LICENSE.txt +++ b/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2019 Qameta Software + Copyright 2016-2024 Qameta Software Inc Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.