From 2c2f88cd43b470a882ae4533af370c917f9db6df Mon Sep 17 00:00:00 2001 From: iCrawl Date: Sun, 17 Apr 2022 19:07:05 +0200 Subject: [PATCH] ci: change logic to parse version --- .github/workflows/documentation.yml | 20 ++++++++++---------- packages/builders/package.json | 2 +- packages/collection/package.json | 2 +- packages/rest/package.json | 2 +- packages/voice/package.json | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index da7019db2..2694d7235 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -48,17 +48,9 @@ jobs: name: docs path: packages/*/docs/docs.json - - uses: frabert/replace-string-action@v2.0 - id: SHORT_BRANCH_NAME - with: - pattern: '(^@\w+\/\w+@v?)?(?\d+.\d+.\d+)-?.*' - string: ${{ env.BRANCH_NAME }} - replace-with: '$' - - name: Set outputs for upload job id: env run: | - echo "::set-output name=SHORT_BRANCH_NAME::${{ steps.SHORT_BRANCH_NAME.outputs.replaced }}" echo "::set-output name=BRANCH_NAME::${GITHUB_REF_NAME}" echo "::set-output name=BRANCH_OR_TAG::${GITHUB_REF_TYPE}" echo "::set-output name=SHA::${GITHUB_SHA}" @@ -73,7 +65,6 @@ jobs: package: ['builders', 'collection', 'discord.js', 'rest', 'voice'] runs-on: ubuntu-latest env: - SHORT_BRANCH_NAME: ${{ needs.build.outputs.SHORT_BRANCH_NAME }} BRANCH_NAME: ${{ needs.build.outputs.BRANCH_NAME }} BRANCH_OR_TAG: ${{ needs.build.outputs.BRANCH_OR_TAG }} SHA: ${{ needs.build.outputs.SHA }} @@ -92,11 +83,20 @@ jobs: path: 'out' - name: Move docs to correct directory + if: env.BRANCH_OR_TAG == 'tag' env: PACKAGE: ${{ matrix.package }} run: | mkdir -p out/${PACKAGE} - mv docs/${PACKAGE}/docs/docs.json out/${PACKAGE}/${SHORT_BRANCH_NAME}.json + mv docs/${PACKAGE}/docs/docs.json out/${PACKAGE}/$(jq --raw-output '.version' packages/${PACKAGE}/package.json).json + + - name: Move docs to correct directory + if: env.BRANCH_OR_TAG == 'branch' + env: + PACKAGE: ${{ matrix.package }} + run: | + mkdir -p out/${PACKAGE} + mv docs/${PACKAGE}/docs/docs.json out/${PACKAGE}/${BRANCH_NAME}.json - name: Commit and push run: | diff --git a/packages/builders/package.json b/packages/builders/package.json index 827756aa2..33b19bdaf 100644 --- a/packages/builders/package.json +++ b/packages/builders/package.json @@ -1,6 +1,6 @@ { "name": "@discordjs/builders", - "version": "0.14.0-dev", + "version": "0.13.0", "description": "A set of builders that you can use when creating your bot", "scripts": { "build": "tsup", diff --git a/packages/collection/package.json b/packages/collection/package.json index ecd254fa5..55fb69ddc 100644 --- a/packages/collection/package.json +++ b/packages/collection/package.json @@ -1,6 +1,6 @@ { "name": "@discordjs/collection", - "version": "0.7.0-dev", + "version": "0.6.0", "description": "Utility data structure used in discord.js", "scripts": { "test": "jest --pass-with-no-tests", diff --git a/packages/rest/package.json b/packages/rest/package.json index 66aa3f400..0a9fbbeb2 100644 --- a/packages/rest/package.json +++ b/packages/rest/package.json @@ -1,6 +1,6 @@ { "name": "@discordjs/rest", - "version": "0.5.0-dev", + "version": "0.4.0", "description": "The REST API for discord.js", "scripts": { "build": "tsup && tsc --emitDeclarationOnly --incremental", diff --git a/packages/voice/package.json b/packages/voice/package.json index 89ba568eb..b03c50655 100644 --- a/packages/voice/package.json +++ b/packages/voice/package.json @@ -1,6 +1,6 @@ { "name": "@discordjs/voice", - "version": "0.10.0-dev", + "version": "0.9.0", "description": "Implementation of the Discord Voice API for node.js", "scripts": { "build": "tsup && node scripts/postbuild.mjs",