Merge pull request #227 from rdkcentral/next

Next to Main - 1.1.0
rdkcentral · Feb 9, 2024 · df0580c · df0580c
2 parents 058b535 + 3699af0
commit df0580c
Show file tree

Hide file tree

Showing 15 changed files with 1,820 additions and 13,120 deletions.
diff --git a/.github/workflows/release-github.yml b/.github/workflows/release-github.yml
@@ -35,41 +35,45 @@ jobs:
         run: 'echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > .npmrc'
       - name: Install dependencies
         run: npm ci
-      - name: Set explicit npm dist-tag default
-        if: github.ref_name == 'main'
+      - name: Set main tags
+        if: github.ref_name == 'main' && github.event_name != 'pull_request'
         run: |
           echo "NPM_DIST_TAG=latest" >> $GITHUB_ENV
-          echo "RELEASE_CHANNEL=latest" >> $GITHUB_ENV
-      - name: Override npm dist-tag for non-main releases
-        if: github.ref_name != 'main'
+          echo "DOCS_TAG=latest" >> $GITHUB_ENV
+      - name: Set next tags
+        if: github.ref_name == 'next' && github.event_name != 'pull_request'
         run: |
-          echo "Setting NPM_DIST_TAG to '${{ github.ref_name }}'"
-          echo "NPM_DIST_TAG=${{ github.ref_name }}" >> $GITHUB_ENV
-      - name: Override release channel for non-main releases
-        if: github.ref_name != 'main'
+          echo "NPM_DIST_TAG=next" >> $GITHUB_ENV
+          echo "DOCS_TAG=next" >> $GITHUB_ENV
+      - name: Set feature branch tags
+        if: github.ref_name != 'main' && github.ref_name != 'next' && github.event_name != 'pull_request'
         run: |
-          echo "Setting RELEASE_CHANNEL to '$(node ./src/js/version.mjs channel $NPM_DIST_TAG)' using branch name '$NPM_DIST_TAG'"
-          echo "RELEASE_CHANNEL=$(node ./src/js/version.mjs channel $NPM_DIST_TAG)" >> $GITHUB_ENV
-      - name: Override release channel for PRs
-        if: github.event_name == 'pull_request'
+          echo "NPM_DIST_TAG=test" >> $GITHUB_ENV
+          echo "FEATURE_BRANCH=${{ github.ref_name }}" >> $GITHUB_ENV
+      - name: Set PR tags
+        if: github.ref_name != 'main' && github.ref_name != 'next' && github.event_name == 'pull_request'
         run: |
-          echo "Setting RELEASE_CHANNEL to 'pr${{ github.event.number }}'"
-          echo "RELEASE_CHANNEL=pr${{ github.event.number }}" >> $GITHUB_ENV
+          echo "NPM_DIST_TAG=test" >> $GITHUB_ENV
+          echo "DOCS_TAG=pr-$(node ./src/js/version.mjs branch-to-prerelease ${{ github.head_ref }})" >> $GITHUB_ENV
+          echo "FEATURE_BRANCH=${{ github.head_ref }}" >> $GITHUB_ENV
       - name: Release mono-artifact to GitHub
         if: (github.ref_name != 'main' && github.event_name != 'pull_request') || github.event_name == 'workflow_dispatch'
         env:
           GITHUB_TOKEN: ${{ secrets.SEMANTIC_RELEASE_BOT_PAT }} # <-- Allows semantic-release-bot to push changes to protected branches
-          npm_config_tag: ${{ env.NPM_DIST_TAG }} # <-- For main, this is `latest.` Otherwise, `next`, `next-major`, etc. See ./.releaserc for release branch config.
         run: npx semantic-release
       - name: Dry-run mono-artifact
         if: (github.ref_name == 'main' && github.event_name != 'workflow_dispatch') || github.event_name == 'pull_request'
         env:
           GITHUB_TOKEN: ${{ secrets.SEMANTIC_RELEASE_BOT_PAT }} # <-- Allows semantic-release-bot to push changes to protected branches
-          npm_config_tag: ${{ env.NPM_DIST_TAG }} # <-- For main, this is `latest.` Otherwise, `next`, `next-major`, etc. See ./.releaserc for release branch config.
         run: npx semantic-release --dry-run
-      - name: Build artifacts for PRs
-        if: github.event_name == 'pull_request'
-        run: npm run dist
+      - name: Build artifacts for feature branches
+        if: github.ref_name != 'main' && github.ref_name != 'next'
+        run: |
+          PRERELEASE=$(node ./src/js/version.mjs branch-to-prerelease $FEATURE_BRANCH)
+          node ./src/js/version.mjs latest-prerelease $PRERELEASE
+          npm version prerelease --preid $PRERELEASE --git-tag-version false
+          npm version prerelease --preid $PRERELEASE --workspaces --git-tag-version false
+          npm run dist
       - name: Check if semantic-release created a build
         id: check_build
         uses: andstor/file-existence-action@v2
@@ -79,32 +83,31 @@ jobs:
         if: steps.check_build.outputs.files_exists == 'true' && github.event_name != 'pull_request' && (github.ref_name != 'main' || github.event_name == 'workflow_dispatch')
         env:
           NPM_TOKEN: ${{ secrets.SEMANTIC_RELEASE_NPM_TOKEN  }} # <-- Allows semantic-release to publish to npm without 2 factor auth.
-          npm_config_tag: ${{ env.NPM_DIST_TAG }} # <-- For main, this is `latest.` Otherwise, `next`, `next-major`, etc. See ./.releaserc for release branch config.
-        run: npm publish --tag $RELEASE_CHANNEL --workspaces
+        run: |
+            npm --version
+            echo "NPM DIST TAG :: " $NPM_DIST_TAG
+            npm publish --tag $NPM_DIST_TAG --workspaces
       - name: Dry-run Firebolt SDKs to NPM
         if: steps.check_build.outputs.files_exists == 'true' && (github.ref_name == 'main' && github.event_name != 'workflow_dispatch')
         env:
           NPM_TOKEN: ${{ secrets.SEMANTIC_RELEASE_NPM_TOKEN  }} # <-- Allows semantic-release to publish to npm without 2 factor auth.
-          npm_config_tag: ${{ env.NPM_DIST_TAG }} # <-- For main, this is `latest.` Otherwise, `next`, `next-major`, etc. See ./.releaserc for release branch config.
-        run: npm publish --tag $RELEASE_CHANNEL --workspaces --dry-run
+        run: npm publish --tag $NPM_DIST_TAG --workspaces --dry-run
       - name: Checkout firebolt GitHub.io repository
         if: steps.check_build.outputs.files_exists == 'true'
         env:
           GITHUB_TOKEN: ${{ secrets.SEMANTIC_RELEASE_BOT_PAT }} # <-- Allows semantic-release-bot to push changes to protected branches
-          npm_config_tag: ${{ env.NPM_DIST_TAG }} # <-- For main, this is `latest.` Otherwise, `next`, `next-major`, etc. See ./.releaserc for release branch config.
         run: |
           cd /tmp
           git clone https://rdkcentral:[email protected]/rdkcentral/firebolt.git ./firebolt-docs
       - name: Release docs to GitHub.io
-        if: steps.check_build.outputs.files_exists == 'true'
+        if: steps.check_build.outputs.files_exists == 'true' && (github.ref_name == 'main' || github.ref_name == 'next' || github.event_name == 'pull_request')
         env:
           GITHUB_TOKEN: ${{ secrets.SEMANTIC_RELEASE_BOT_PAT }} # <-- Allows semantic-release-bot to push changes to protected branches
-          npm_config_tag: ${{ env.NPM_DIST_TAG }} # <-- For main, this is `latest.` Otherwise, `next`, `next-major`, etc. See ./.releaserc for release branch config.
         run: |
-          npm run publish:docs /tmp/firebolt-docs $RELEASE_CHANNEL
+          npm run publish:docs /tmp/firebolt-docs $DOCS_TAG
           cd /tmp/firebolt-docs
           git config --global user.email "[email protected]"
           git config --global user.name "Your Name"
           git add --all
-          git diff-index --quiet HEAD || git commit -m "chore: Publish $RELEASE_CHANNEL"
+          git diff-index --quiet HEAD || git commit -m "chore: Publish $DOCS_TAG"
           git push
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -0,0 +1,4 @@
+{
+  "semi": false,
+  "singleQuote": true
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,24 @@
+# [1.1.0-next.3](https://github.com/rdkcentral/firebolt-apis/compare/v1.1.0-next.2...v1.1.0-next.3) (2024-02-07)
+
+
+### Bug Fixes
+
+* Modified account:uid to SHOULD ([#224](https://github.com/rdkcentral/firebolt-apis/issues/224)) ([70c8b24](https://github.com/rdkcentral/firebolt-apis/commit/70c8b24decfcbff2c32fb1b0d21290afc00a8432))
+
+# [1.1.0-next.2](https://github.com/rdkcentral/firebolt-apis/compare/v1.1.0-next.1...v1.1.0-next.2) (2024-02-07)
+
+
+### Bug Fixes
+
+* Add Music to Playable entities ([#225](https://github.com/rdkcentral/firebolt-apis/issues/225)) ([22c9b71](https://github.com/rdkcentral/firebolt-apis/commit/22c9b71d3c0ee98d32585d1b365afabf8e64d6ed))
+
+# [1.1.0-next.1](https://github.com/rdkcentral/firebolt-apis/compare/v1.0.0...v1.1.0-next.1) (2024-01-16)
+
+
+### Features
+
+* HDMI Low Latency Mode ([#156](https://github.com/rdkcentral/firebolt-apis/issues/156)) ([06d3624](https://github.com/rdkcentral/firebolt-apis/commit/06d3624b69ee0529d4c1a1c78a15dbfdf54c8b16))
+
 # [1.0.0](https://github.com/rdkcentral/firebolt-apis/compare/v0.17.1...v1.0.0) (2023-11-03)