Skip to content

Commit

Permalink
Merge branch 'fdc3-for-web' into thorsent/fdc3-for-web-spec
Browse files Browse the repository at this point in the history
  • Loading branch information
kriswest authored Apr 15, 2024
2 parents 28c7a95 + 65aca0b commit 02d0322
Show file tree
Hide file tree
Showing 121 changed files with 1,978 additions and 905 deletions.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/discussion-group.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,26 @@ Thursday DD MMM yyyy - 10am (US eastern timezone EDT/EST) / 3pm (London, GMT/BST
- FINOS project meetings may be recorded for use solely by the FINOS team for administration purposes. In very limited instances, and with explicit approval, recordings may be made more widely available.

- A Discussion Group has no direct decision-making power regarding the FDC3 standard - rather it is intended that anything they propose or work on will result in proposals (via Github issues and PRs) for the Standards Working Group participants to consider and vote on for inclusion in the standard.


## Participation Requirements

**Note:** Meeting participants are expected to accept the terms of the FDC3 license (Community Specification License), understand the governance process and have a CLA in place.

Please click the following links at the start of the meeting if you have not done so previously.

- [View the CSL](https://raw.githubusercontent.com/finos/FDC3/main/LICENSE.md)
- [View the GOVERNANCE of the Project](https://github.com/finos/FDC3/blob/main/GOVERNANCE.md)
- [Click here to start a PR](https://github.com/finos/FDC3/edit/main/NOTICES.md).
- Edit the page to add your details.
- Hit the save button.
- Click "Create Pull Request".
- Click "Accept" on the EasyCLA dialog in the PR's discussion section.
- [Click here to send email to become a voting participant on the FDC3 Project](mailto:fdc3-participants+subscribe@finos.org?subject=Please%20enroll%20me%20as%20an%20FDC3%20Standards%20Participant&body=HI%2C%20my%20name%20is%20%3CFirstName%20LastName%3E%20and%20I'd%20like%20to%20formally%20participate%20to%20the%20FDC3%20standard%20process.%20I%20plan%20to%20contribute%20as%20%3Cindividual%7Con%20behalf%20of%20organizationName%3E%20and%20I%20have%20reviewed%20the%20policies%20described%20at%20https%3A%2F%2Fgithub.com%2Ffinos%2FFDC3%2Fblob%2Fmain%2FGOVERNANCE.md%20and%20read%20the%20license%20at%20https%3A%2F%2Fgithub.com%2Ffinos%2FFDC3%2Fblob%2Fmain%2FLICENSE%20.%20Thank%20you!")

## Tracking Attendance

**Note:** Meeting participants are expected to _add a comment to this GitHub issue_ in order that we can track attendance of FDC3 project meetings. Please do this at the start of the meeting.

## Agenda
- [ ] Convene & roll call, review meeting notices (5mins)
Expand Down
19 changes: 19 additions & 0 deletions .github/ISSUE_TEMPLATE/general-meeting.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,25 @@ DD MMM yyyy - 10am EST / 3pm GMT

- FINOS project meetings may be recorded for use solely by the FINOS team for administration purposes. In very limited instances, and with explicit approval, recordings may be made more widely available.

## Participation Requirements

**Note:** Meeting participants are expected to accept the terms of the FDC3 license (Community Specification License), understand the governance process and have a CLA in place.

Please click the following links at the start of the meeting if you have not done so previously.

- [View the CSL](https://raw.githubusercontent.com/finos/FDC3/main/LICENSE.md)
- [View the GOVERNANCE of the Project](https://github.com/finos/FDC3/blob/main/GOVERNANCE.md)
- [Click here to start a PR](https://github.com/finos/FDC3/edit/main/NOTICES.md).
- Edit the page to add your details.
- Hit the save button.
- Click "Create Pull Request".
- Click "Accept" on the EasyCLA dialog in the PR's discussion section.
- [Click here to send email to become a voting participant on the FDC3 Project](mailto:fdc3-participants+subscribe@finos.org?subject=Please%20enroll%20me%20as%20an%20FDC3%20Standards%20Participant&body=HI%2C%20my%20name%20is%20%3CFirstName%20LastName%3E%20and%20I'd%20like%20to%20formally%20participate%20to%20the%20FDC3%20standard%20process.%20I%20plan%20to%20contribute%20as%20%3Cindividual%7Con%20behalf%20of%20organizationName%3E%20and%20I%20have%20reviewed%20the%20policies%20described%20at%20https%3A%2F%2Fgithub.com%2Ffinos%2FFDC3%2Fblob%2Fmain%2FGOVERNANCE.md%20and%20read%20the%20license%20at%20https%3A%2F%2Fgithub.com%2Ffinos%2FFDC3%2Fblob%2Fmain%2FLICENSE%20.%20Thank%20you!")

## Tracking Attendance

**Note:** Meeting participants are expected to _add a comment to this GitHub issue_ in order that we can track attendance of FDC3 project meetings. Please do this at the start of the meeting.

## Agenda
- [ ] Convene & roll call, review meeting notices (5mins)
- [ ] Review action items from previous meeting (5mins)
Expand Down
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/standard-wg-meeting.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,26 @@ Thursday DD MMM yyyy - 10am (US eastern timezone EDT/EST) / 3pm (London, GMT/BST

- FINOS project meetings may be recorded for use solely by the FINOS team for administration purposes. In very limited instances, and with explicit approval, recordings may be made more widely available.


## Participation Requirements

**Note:** Meeting participants are expected to accept the terms of the FDC3 license (Community Specification License), understand the governance process and have a CLA in place.

Please click the following links at the start of the meeting if you have not done so previously.

- [View the CSL](https://raw.githubusercontent.com/finos/FDC3/main/LICENSE)
- [View the GOVERNANCE of the Project](https://github.com/finos/FDC3/blob/main/GOVERNANCE.md)
- [Click here to start a PR](https://github.com/finos/FDC3/edit/main/NOTICES.md).
- Edit the page to add your details.
- Hit the save button.
- Click "Create Pull Request".
- Click "Accept" on the EasyCLA dialog in the PR's discussion section.
- [Click here to send email to become a voting participant on the FDC3 Project](mailto:fdc3-participants+subscribe@finos.org?subject=Please%20enroll%20me%20as%20an%20FDC3%20Standards%20Participant&body=HI%2C%20my%20name%20is%20%3CFirstName%20LastName%3E%20and%20I'd%20like%20to%20formally%20participate%20to%20the%20FDC3%20standard%20process.%20I%20plan%20to%20contribute%20as%20%3Cindividual%7Con%20behalf%20of%20organizationName%3E%20and%20I%20have%20reviewed%20the%20policies%20described%20at%20https%3A%2F%2Fgithub.com%2Ffinos%2FFDC3%2Fblob%2Fmain%2FGOVERNANCE.md%20and%20read%20the%20license%20at%20https%3A%2F%2Fgithub.com%2Ffinos%2FFDC3%2Fblob%2Fmain%2FLICENSE%20.%20Thank%20you!")

## Tracking Attendance

**Note:** Meeting participants are expected to _add a comment to this GitHub issue_ in order that we can track attendance of FDC3 project meetings. Please do this at the start of the meeting.

## Agenda
- [ ] Convene & roll call, review meeting notices (5mins)
- [ ] Review action items from previous meeting (5mins)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cve-scanning.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [18.x]
node-version: [20]
steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
Expand Down
90 changes: 0 additions & 90 deletions .github/workflows/meetings.yml

This file was deleted.

61 changes: 37 additions & 24 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
name: npm-build

# Only trigger on:
# - master branch
# - main branch
# - PR or Pull Request event types
# - Exclide Docusaurus files: this file, docs/** and website/**
on:
push:
branches:
- master
- main
- release/**
paths-ignore:
- '.github/workflows/docusaurus.yml'
- 'docs/**'
- 'website/**'
pull_request:
branches:
- master
- main
- release/*
paths-ignore:
- '.github/workflows/docusaurus.yml'
Expand All @@ -28,35 +28,38 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
node: [18.16.x]
node: [20]
os: [ubuntu-latest, windows-latest]

steps:
- name: Checkout repo
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Use Node ${{ matrix.node }}
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}

- name: Install dependencies
uses: bahmutov/npm-install@c5482d70ec8706408996e31ac94075030694993f #v1.8.32
uses: bahmutov/npm-install@2509f13e8485d88340a789a3f7ca11aaac47c9fc #v1.8.36

- name: Lint
run: yarn lint
run: npm run lint

- name: Test
run: yarn test --ci --coverage --maxWorkers=2
run: npm run test --ci --coverage --maxWorkers=2

- name: Build
run: yarn build
run: npm run build

pacakge-publish:
package-publish:
if: ${{ github.event_name == 'push' }}
needs: package-build
name: Publish package to ${{ matrix.name }}
runs-on: ubuntu-latest
permissions:
contents: read
id-token: write
strategy:
matrix:
include:
Expand All @@ -68,30 +71,40 @@ jobs:
token-name: GITHUB_TOKEN
steps:
- name: Checkout repo
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Configure Node
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: 18.16.x
node-version: 20
registry-url: ${{ matrix.registry }}

- name: Check package version
id: check-version
uses: PostHog/check-package-version@adccce0ed9759513476413668bd2a5c995450bde #v2.0.0
uses: tehpsalmist/npm-publish-status-action@deb911186cfe5134094f49183364da10a986e4e7

- name: Package version info
run: |
echo "Committed version: ${{ steps.check-version.outputs.committed-version }}"
echo "Published version: ${{ steps.check-version.published-version }}"
echo "Is version new: ${{ steps.check-version.outputs.is-new-version }}"
# Disabled when switching from PostHog/check-package-version as the new lib
# just tells you if your version exists or not
# - name: Package version info
# run: |
# echo "Committed version: ${{ steps.check-version.outputs.committed-version }}"
# echo "Published version: ${{ steps.check-version.published-version }}"
# echo "Is version new: ${{ steps.check-version.outputs.is-new-version }}"

- name: Report already published status
if: steps.check-version.outputs.exists == '1'
run: 'echo "package version already exists on npm registry"'

- name: Report not yet published status
if: steps.check-version.outputs.exists == '0'
run: 'echo "package version does not exist on npm registry, publishing..."'

- name: Install dependencies
if: steps.check-version.outputs.is-new-version == 'true'
uses: bahmutov/npm-install@c5482d70ec8706408996e31ac94075030694993f #v1.8.32
if: steps.check-version.outputs.exists == '0'
uses: bahmutov/npm-install@2509f13e8485d88340a789a3f7ca11aaac47c9fc #v1.8.36

- name: Publish
if: steps.check-version.outputs.is-new-version == 'true'
run: yarn publish --access public
if: steps.check-version.outputs.exists == '0'
run: npm publish --provenance --access public
env:
NODE_AUTH_TOKEN: ${{ secrets[matrix.token-name] }}
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

### Added

* Added clarification that `id` field values SHOULD always be strings to context schema definition (a restriction that can't easily be represented in the generated types). ([#1149](https://github.com/finos/FDC3/pull/1149))
* Specifications for getAgent() and Browser-Resident Desktop Agents.
* Specification for Preload Desktop Agents. This content was previously in the supported platforms section. It had been revised and amended to include recommended behavior related to the new validateAppIdentity() function.
* Added optional validateAppIdentity() function to DesktopAgent interface.
Expand All @@ -23,6 +24,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

### Fixed

* Added missing `desktopAgent` field to ImplementationMetadata objects returned for all agents connect to a DesktopAgent bridge in Connection Step 6 connectAgentsUpdate messages and refined the schema used to collect this info in step 3 handshake. ([#1177](https://github.com/finos/FDC3/pull/1177))
* Removed the `version` field from `IntentResolution` as there are no version fields for intents in the FDC3 API definitions and hence the field has no purpose. ([#1170](https://github.com/finos/FDC3/pull/1170))

## [FDC3 Standard 2.1](https://github.com/finos/FDC3/compare/v2.0..v2.1) - 2023-09-13

### Added
Expand Down Expand Up @@ -64,6 +68,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

### Fixed

* Removed the union type for the `ChatMessage` context, which caused issues for languages not having union types. This is a breaking change (made before the final version of 2.1 is released).
* Corrected chatInitSettings context schema to incorporate the Context schema. ([#869](https://github.com/finos/FDC3/pull/869))
* Corrected schema syntax in chatInitSettings and renamed the `public` property to `isPublic` (as `public` is a reserved keyword in javascript). ([#875](https://github.com/finos/FDC3/pull/875))
* Further clarified the difference between the behavior of User channels and other channel types on joinUserChannel/addContextListener. ([#971](https://github.com/finos/FDC3/pull/971))
Expand Down
Loading

0 comments on commit 02d0322

Please sign in to comment.