Skip to content

Commit fe39f9f

Browse files
YPandasYuqi Huangdependabot[bot]sirknightj
authored
Release v2.6.0 (#697)
* scoped permission to the minimum requirement (#686) Co-authored-by: Yuqi Huang <yuuqih@amazon.com> * Bump webpack from 5.103.0 to 5.105.0 (#690) Bumps [webpack](https://github.com/webpack/webpack) from 5.103.0 to 5.105.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Changelog](https://github.com/webpack/webpack/blob/main/CHANGELOG.md) - [Commits](webpack/webpack@v5.103.0...v5.105.0) --- updated-dependencies: - dependency-name: webpack dependency-version: 5.105.0 dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump fast-xml-parser, @aws-sdk/client-kinesis-video, @aws-sdk/client-kinesis-video-signaling and @aws-sdk/client-kinesis-video-webrtc-storage (#692) Bumps [fast-xml-parser](https://github.com/NaturalIntelligence/fast-xml-parser) to 5.3.6 and updates ancestor dependencies [fast-xml-parser](https://github.com/NaturalIntelligence/fast-xml-parser), [@aws-sdk/client-kinesis-video](https://github.com/aws/aws-sdk-js-v3/tree/HEAD/clients/client-kinesis-video), [@aws-sdk/client-kinesis-video-signaling](https://github.com/aws/aws-sdk-js-v3/tree/HEAD/clients/client-kinesis-video-signaling) and [@aws-sdk/client-kinesis-video-webrtc-storage](https://github.com/aws/aws-sdk-js-v3/tree/HEAD/clients/client-kinesis-video-webrtc-storage). These dependencies need to be updated together. Updates `fast-xml-parser` from 4.4.1 to 5.3.6 - [Release notes](https://github.com/NaturalIntelligence/fast-xml-parser/releases) - [Changelog](https://github.com/NaturalIntelligence/fast-xml-parser/blob/master/CHANGELOG.md) - [Commits](NaturalIntelligence/fast-xml-parser@v4.4.1...v5.3.6) Updates `@aws-sdk/client-kinesis-video` from 3.758.0 to 3.995.0 - [Release notes](https://github.com/aws/aws-sdk-js-v3/releases) - [Changelog](https://github.com/aws/aws-sdk-js-v3/blob/main/clients/client-kinesis-video/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-js-v3/commits/v3.995.0/clients/client-kinesis-video) Updates `@aws-sdk/client-kinesis-video-signaling` from 3.758.0 to 3.995.0 - [Release notes](https://github.com/aws/aws-sdk-js-v3/releases) - [Changelog](https://github.com/aws/aws-sdk-js-v3/blob/main/clients/client-kinesis-video-signaling/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-js-v3/commits/v3.995.0/clients/client-kinesis-video-signaling) Updates `@aws-sdk/client-kinesis-video-webrtc-storage` from 3.758.0 to 3.995.0 - [Release notes](https://github.com/aws/aws-sdk-js-v3/releases) - [Changelog](https://github.com/aws/aws-sdk-js-v3/blob/main/clients/client-kinesis-video-webrtc-storage/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-js-v3/commits/v3.995.0/clients/client-kinesis-video-webrtc-storage) --- updated-dependencies: - dependency-name: fast-xml-parser dependency-version: 5.3.6 dependency-type: indirect - dependency-name: "@aws-sdk/client-kinesis-video" dependency-version: 3.995.0 dependency-type: direct:production - dependency-name: "@aws-sdk/client-kinesis-video-signaling" dependency-version: 3.995.0 dependency-type: direct:production - dependency-name: "@aws-sdk/client-kinesis-video-webrtc-storage" dependency-version: 3.995.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump webpack from 5.98.0 to 5.105.0 in /aws-sdk-build (#689) Bumps [webpack](https://github.com/webpack/webpack) from 5.98.0 to 5.105.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Changelog](https://github.com/webpack/webpack/blob/main/CHANGELOG.md) - [Commits](webpack/webpack@v5.98.0...v5.105.0) --- updated-dependencies: - dependency-name: webpack dependency-version: 5.105.0 dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump undici from 6.21.3 to 6.23.0 (#688) Bumps [undici](https://github.com/nodejs/undici) from 6.21.3 to 6.23.0. - [Release notes](https://github.com/nodejs/undici/releases) - [Commits](nodejs/undici@v6.21.3...v6.23.0) --- updated-dependencies: - dependency-name: undici dependency-version: 6.23.0 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump node-forge from 1.3.1 to 1.3.2 (#665) Bumps [node-forge](https://github.com/digitalbazaar/forge) from 1.3.1 to 1.3.2. - [Changelog](https://github.com/digitalbazaar/forge/blob/main/CHANGELOG.md) - [Commits](digitalbazaar/forge@v1.3.1...v1.3.2) --- updated-dependencies: - dependency-name: node-forge dependency-version: 1.3.2 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump ts-jest from 29.4.5 to 29.4.6 (#667) Bumps [ts-jest](https://github.com/kulshekhar/ts-jest) from 29.4.5 to 29.4.6. - [Release notes](https://github.com/kulshekhar/ts-jest/releases) - [Changelog](https://github.com/kulshekhar/ts-jest/blob/main/CHANGELOG.md) - [Commits](kulshekhar/ts-jest@v29.4.5...v29.4.6) --- updated-dependencies: - dependency-name: ts-jest dependency-version: 29.4.6 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump jsdom from 27.2.0 to 27.3.0 (#669) Bumps [jsdom](https://github.com/jsdom/jsdom) from 27.2.0 to 27.3.0. - [Release notes](https://github.com/jsdom/jsdom/releases) - [Changelog](https://github.com/jsdom/jsdom/blob/main/Changelog.md) - [Commits](jsdom/jsdom@27.2.0...27.3.0) --- updated-dependencies: - dependency-name: jsdom dependency-version: 27.3.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump prettier from 3.6.2 to 3.7.4 (#670) Bumps [prettier](https://github.com/prettier/prettier) from 3.6.2 to 3.7.4. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](prettier/prettier@3.6.2...3.7.4) --- updated-dependencies: - dependency-name: prettier dependency-version: 3.7.4 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump @typescript-eslint/eslint-plugin from 8.48.0 to 8.49.0 (#671) Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 8.48.0 to 8.49.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.49.0/packages/eslint-plugin) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-version: 8.49.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Sample change: allow master ingest mode to send video-only (#693) * change from pull_request to pull_request_target (#696) - enable the CI to automatically change the base of dependabot PR Co-authored-by: Yuqi Huang <yuuqih@amazon.com> * Added version check yml file (#678) * Change URL for fetching regional data (#674) * Fix undefined channelHelper check (#675) * Migrate to OIDC trusted publishing (#676) * Add version check workflow to enforce version updates on PRs - Validates version changes in package.json, package-lock.json, and src/index.ts - Ensures all version files are synchronized before merging to master - Prevents PRs from being merged without proper version bumps --------- Co-authored-by: sirknightj <jggunawa@amazon.com> Co-authored-by: Yuqi Huang <yuuqih@amazon.com> * bump version to 2.6.0 (#695) Co-authored-by: Yuqi Huang <yuuqih@amazon.com> * Make sure permission is explicitly stated (#698) Co-authored-by: Yuqi Huang <yuuqih@amazon.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Yuqi Huang <yuuqih@amazon.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: sirknightj <jggunawa@amazon.com>
1 parent c99e8e1 commit fe39f9f

File tree

7 files changed

+1501
-1101
lines changed

7 files changed

+1501
-1101
lines changed

.github/workflows/develop-publish-gh-pages.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44
push:
55
branches:
66
- develop
7+
permissions:
8+
contents: write
9+
pages: write
710
jobs:
811
publish-ubuntu-build:
912
runs-on: ubuntu-latest

.github/workflows/retarget-dependabot-to-develop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Retarget Dependabot PRs to develop
22

33
on:
4-
pull_request:
4+
pull_request_target:
55
branches:
66
- master
77

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
name: Check Version Mismatch between PR branch and master.
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- master
7+
8+
permissions:
9+
contents: read
10+
11+
jobs:
12+
check-version:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Checkout PR branch
16+
uses: actions/checkout@v4
17+
18+
- name: Get version from PR
19+
id: pr_version
20+
run: |
21+
PR_VERSION=$(grep -Po '"version": "\K[0-9]+\.[0-9]+\.[0-9]+' package.json)
22+
PR_LOCK_VERSION=$(grep -Po '"version": "\K[0-9]+\.[0-9]+\.[0-9]+' package-lock.json | head -1)
23+
PR_INDEX_VERSION=$(grep -Po "VERSION = '\K[0-9]+\.[0-9]+\.[0-9]+" src/index.ts || echo "$PR_VERSION")
24+
echo "PR_VERSION=$PR_VERSION" >> "$GITHUB_ENV"
25+
echo "PR_LOCK_VERSION=$PR_LOCK_VERSION" >> "$GITHUB_ENV"
26+
echo "PR_INDEX_VERSION=$PR_INDEX_VERSION" >> "$GITHUB_ENV"
27+
echo "PR Version: $PR_VERSION"
28+
echo "PR Lock Version: $PR_LOCK_VERSION"
29+
echo "PR Index Version: $PR_INDEX_VERSION"
30+
31+
- name: Checkout master branch
32+
uses: actions/checkout@v4
33+
with:
34+
ref: master
35+
36+
- name: Get version from master
37+
id: master_version
38+
run: |
39+
MASTER_VERSION=$(grep -Po '"version": "\K[0-9]+\.[0-9]+\.[0-9]+' package.json)
40+
MASTER_LOCK_VERSION=$(grep -Po '"version": "\K[0-9]+\.[0-9]+\.[0-9]+' package-lock.json | head -1)
41+
MASTER_INDEX_VERSION=$(grep -Po "VERSION = '\K[0-9]+\.[0-9]+\.[0-9]+" src/index.ts || echo "$MASTER_VERSION")
42+
echo "MASTER_VERSION=$MASTER_VERSION" >> "$GITHUB_ENV"
43+
echo "MASTER_LOCK_VERSION=$MASTER_LOCK_VERSION" >> "$GITHUB_ENV"
44+
echo "MASTER_INDEX_VERSION=$MASTER_INDEX_VERSION" >> "$GITHUB_ENV"
45+
echo "Master version: $MASTER_VERSION"
46+
echo "Master lock version: $MASTER_LOCK_VERSION"
47+
echo "Master index version: $MASTER_INDEX_VERSION"
48+
49+
- name: Compare versions
50+
run: |
51+
echo "Comparing versions:"
52+
echo " package.json - Master: $MASTER_VERSION, PR: $PR_VERSION"
53+
echo " package-lock.json - Master: $MASTER_LOCK_VERSION, PR: $PR_LOCK_VERSION"
54+
echo " src/index.ts - Master: $MASTER_INDEX_VERSION, PR: $PR_INDEX_VERSION"
55+
56+
if [ "$MASTER_VERSION" == "$PR_VERSION" ]; then
57+
echo "Please update the version in package.json file. Any PR getting merged to master requires a version update"
58+
exit 1
59+
elif [ "$MASTER_LOCK_VERSION" == "$PR_LOCK_VERSION" ]; then
60+
echo "Please update the version in package-lock.json file. Run 'npm install' after updating package.json"
61+
exit 1
62+
elif [ "$MASTER_INDEX_VERSION" == "$PR_INDEX_VERSION" ]; then
63+
echo "Please update the version in src/index.ts file to match package.json version"
64+
exit 1
65+
elif [ "$PR_VERSION" != "$PR_LOCK_VERSION" ]; then
66+
echo "Version mismatch between package.json ($PR_VERSION) and package-lock.json ($PR_LOCK_VERSION). Run 'npm install' to sync"
67+
exit 1
68+
else
69+
echo "Version update detected and all the files are in sync."
70+
fi

0 commit comments

Comments
 (0)