diff --git a/.github/workflows/bump.yml b/.github/workflows/bump.yml index afb3170e..5d7dc61f 100644 --- a/.github/workflows/bump.yml +++ b/.github/workflows/bump.yml @@ -15,10 +15,10 @@ jobs: uses: actions/checkout@v2 - name: Get version from package.json before release step id: extractver - run: echo "::set-output name=version::$(npm run get-version --silent)" + run: echo "::set-output name=version::$(npm run get:version --silent)" - name: Get name of package from package.json id: extractname - run: echo "::set-output name=packname::$(npm run get-name --silent)" + run: echo "::set-output name=packname::$(npm run get:name --silent)" - if: startsWith(github.event.commits[0].message, 'chore(release):') name: Bumping latest version of this package in other repositories uses: derberg/org-projects-dependency-manager@v1 diff --git a/.github/workflows/pull-request-testing.yml b/.github/workflows/pull-request-testing.yml deleted file mode 100644 index aa3be21a..00000000 --- a/.github/workflows/pull-request-testing.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Pull request testing - -on: - pull_request: - types: [opened, reopened, synchronize, ready_for_review] - -jobs: - test_pr: - if: github.event.pull_request.draft == false - name: 'Testing pull request' - runs-on: ubuntu-latest - steps: - - name: Checkout repo - uses: actions/checkout@v2 - - name: Setup Node.js - uses: actions/setup-node@v1 - with: - node-version: 14 - - name: Install dependencies - run: npm ci - - name: Run linter - run: npm run lint - - name: Run tests - run: npm test \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 835ad7c5..00000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: Release - -on: - push: - branches: - - master - -jobs: - release: - name: 'Release NPM, GitHub, Docker' - runs-on: ubuntu-latest - steps: - - name: Checkout repo - uses: actions/checkout@v2 - - name: Setup Node.js - uses: actions/setup-node@v1 - with: - node-version: 14 - - name: Install dependencies - run: npm ci - - name: Run tests - run: npm test - - name: Run linter - run: npm run lint - - name: Get version from package.json before release step - id: initversion - run: echo "::set-output name=version::$(npm run get-version --silent)" - - name: Release to NPM and GitHub - id: release - env: - GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} - GIT_AUTHOR_NAME: asyncapi-bot - GIT_AUTHOR_EMAIL: info@asyncapi.io - GIT_COMMITTER_NAME: asyncapi-bot - GIT_COMMITTER_EMAIL: info@asyncapi.io - run: npm run release - - name: Get version from package.json after release step - id: extractver - run: echo "::set-output name=version::$(npm run get-version --silent)" - - name: Create Pull Request with updated package files - if: steps.initversion.outputs.version != steps.extractver.outputs.version - uses: peter-evans/create-pull-request@v2.4.4 - with: - token: ${{ secrets.GH_TOKEN }} - commit-message: 'chore(release): ${{ steps.extractver.outputs.version }}' - committer: asyncapi-bot - author: asyncapi-bot - title: 'chore(release): ${{ steps.extractver.outputs.version }}' - body: 'Version bump in package.json and package-lock.json for release [${{ steps.extractver.outputs.version }}](https://github.com/${{github.repository}}/releases/tag/v${{ steps.extractver.outputs.version }})' - branch: version-bump/${{ steps.extractver.outputs.version }} diff --git a/package.json b/package.json index 7819f8a9..6e504524 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,10 @@ "test": "mocha --recursive", "release": "semantic-release", "lint": "eslint --max-warnings 0 --config .eslintrc .", - "get-version": "echo $npm_package_version", - "get-name": "echo $npm_package_name" + "get:version": "echo $npm_package_version", + "get:name": "echo $npm_package_name", + "generate:assets": "echo 'No additional assets need to be generated at the moment'", + "bump:version": "npm --no-git-tag-version --allow-same-version version $VERSION" }, "repository": { "type": "git",