Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync secrets epic branch #140

Merged
merged 57 commits into from
Jun 10, 2024
Merged

Conversation

nvyasadobe
Copy link
Contributor

This PR is to sync secretsManage epic branch with the latest changes of main.

Description

Created branch sync_secrets_epic_branch from epic/secretsmanage, took pull of main, resolved conflict and one issue of failing test in this commit

This is need because when epic/secretsmanage branch was created cloudflare changes was not merged to main. So doing this we are syncing epic branch with main branch.

Related Issue

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • I have signed the Adobe Open Source CLA.
  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

dthampy and others added 30 commits January 11, 2024 11:37
V3.2.1-beta.0 develop->main
V3.2.1-beta.0 -> use yarn for publish
revert: CEXT-2672 revert mesh builder version to test error
v3.2.1-beta.2 - npm publish with previous version of tool
v3.2.2 - npm publish with previous version of tool
v3.2.3 - updated @adobe-apimesh/mesh-builder version to 1.4.2
…rg, project, workspace like create.

- Updated install command with updated signature.
…hconfig-history

Org name and Project name pass as header in create mesh
# Conflicts:
#	package.json
#	src/commands/api-mesh/create.js
…-workspace-on-update

# Conflicts:
#	package.json
nvyasadobe and others added 25 commits March 7, 2024 18:31
Update publish-to-npm workflow to accommodate alpha and beta packages
Cext 2742 - CLI status command changes related to edge.
…workspace-on-update

Feature/cext 2719 support passing workspace on update
CEXT-3006: increase alpha version for edge mesh
Epic Deployment to Cloudflare
Update edge mesh release to beta version
…that all latest changes including cloudflare changes can be pulled in
@revanth0212 revanth0212 merged commit efee233 into epic/secretsmanage Jun 10, 2024
3 checks passed
@revanth0212 revanth0212 deleted the sync_secrets_epic_branch branch June 10, 2024 21:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants