Skip to content

Conversation

@dependabot
Copy link

@dependabot dependabot bot commented on behalf of github Sep 1, 2022

Bumps 3rdparty/symcrypt_engine/SymCrypt-OpenSSL from 2962228 to 948a1dd.

Commits
  • 948a1dd Intercept stitched AES-CBC + HMAC ciphers and disable them (#50)
  • a44b1ea Merge pull request #49 from microsoft/mitchl-dbg-flag
  • b0da23a Do not set -DDBG=1 when build type is RelWithDebInfo
  • 6e95a78 Use new SymCrypt flags to specify asymmetric key purposes (#48)
  • b1e5905 Avoid redundant EC_KEY tests on key generation (#45)
  • 055d83b Ensure method flags are compatible with FIPS mode OpenSSL (#46)
  • See full diff in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

Bumps [3rdparty/symcrypt_engine/SymCrypt-OpenSSL](https://github.com/microsoft/SymCrypt-OpenSSL) from `2962228` to `948a1dd`.
- [Release notes](https://github.com/microsoft/SymCrypt-OpenSSL/releases)
- [Commits](microsoft/SymCrypt-OpenSSL@2962228...948a1dd)

---
updated-dependencies:
- dependency-name: 3rdparty/symcrypt_engine/SymCrypt-OpenSSL
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot added dependencies Pull requests that update a dependency file submodules Pull requests that update Submodules code labels Sep 1, 2022
@dependabot @github
Copy link
Author

dependabot bot commented on behalf of github Sep 17, 2022

Superseded by #8.

@dependabot dependabot bot closed this Sep 17, 2022
@dependabot dependabot bot deleted the dependabot/submodules/3rdparty/symcrypt_engine/SymCrypt-OpenSSL-948a1dd branch September 17, 2022 13:20
CyanDevs added a commit that referenced this pull request Jan 5, 2023
4520: Fix bors builds r=CyanDevs a=CyanDevs

Multibranch pipelines (which Bors runs as) behave a bit differently than manually triggered pipelines in terms of parameters.
1. It does not specify user-defined parameters. If there are any user-defined parameters, then use the defaults. E.g. `params.BRANCH_NAME` or `$BRANCH_NAME` in shell would be master.
2. To differentiate between different branch in a multibranch pipeline job, an environment variable `BRANCH_NAME` is used and is normally referred to as `env.BRANCH_NAME` or `$BRANCH_NAME` in shell.

The problem is both user-defined parameters and Groovy variables are loaded into environment as environment variables (thanks to workflow-cps-plugin) and there is an order of precedence. Point #1 became relevant as user-defined parameters were added to the declarative pipeline in [my last PR](https://github.com/openenclave/openenclave/pull/4505/files#diff-917491029f94ac1ce6c114a542d2a8738ce1f2d1e866eaffe7189d2139250200)). Specifically the user-defined parameter param.BRANCH_NAME took precedence over Groovy variable BRANCH_NAME when loaded into the environment. Therefore both env.BRANCH_NAME, params.BRANCH_NAME, and BRANCH_NAME all referred to the same variable and led to Bors always checking out `master`.

This PR fixes the Bors builds by renaming conflicting parameter name, and prefixing global Groovy variables with `GLOBAL_` to be more explicit. So `GLOBAL_BRANCH_NAME` will be set by `env.BRANCH_NAME` (point #2), or if that does not exist, the user-defined parameter `params.BRANCH` (point #1).

As a side issue, this also changes `REPOSITORY_NAME`, `DOCKER_TAG` and `FULL_TEST_SUITE` to solely a user-defined parameter.

Signed-off-by: Chris Yan <chrisyan@microsoft.com>

Co-authored-by: Chris Yan <chrisyan@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dependencies Pull requests that update a dependency file submodules Pull requests that update Submodules code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

0 participants