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

Bump actions/upload-artifact from 3.0.0 to 3.1.0 #14066

Merged

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github May 20, 2022

Bumps actions/upload-artifact from 3.0.0 to 3.1.0.

Release notes

Sourced from actions/upload-artifact's releases.

v3.1.0

What's Changed

Commits
  • 3cea537 Merge pull request #327 from actions/robherley/artifact-1.1.0
  • 849aa77 nvm use 12 & npm run release
  • 4d39869 recompile with correct ncc version
  • 2e0d362 bump @​actions/artifact to 1.1.0
  • 09a5d6a Merge pull request #320 from actions/dependabot/npm_and_yarn/ansi-regex-4.1.1
  • 189315d Bump ansi-regex from 4.1.0 to 4.1.1
  • d159c2d Merge pull request #297 from actions/dependabot/npm_and_yarn/ajv-6.12.6
  • c26a7ba Bump ajv from 6.11.0 to 6.12.6
  • 6ed6c72 Merge pull request #303 from actions/dependabot/npm_and_yarn/yargs-parser-13.1.2
  • 2aeee26 Bump yargs-parser from 13.1.1 to 13.1.2
  • Additional commits viewable in compare view

Dependabot compatibility score

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 [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3.0.0 to 3.1.0.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@6673cd0...3cea537)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot added dependencies Pull requests that update a dependency file github_actions Pull requests that update Github_actions code labels May 20, 2022
@jujubot
Copy link
Collaborator

jujubot commented May 20, 2022

Can one of the admins verify this patch?

1 similar comment
@jujubot
Copy link
Collaborator

jujubot commented May 20, 2022

Can one of the admins verify this patch?

@hpidcock hpidcock merged commit ae29bfa into 2.9 May 23, 2022
@dependabot dependabot bot deleted the dependabot/github_actions/actions/upload-artifact-3.1.0 branch May 24, 2022 00:00
@wallyworld wallyworld mentioned this pull request May 25, 2022
jujubot added a commit that referenced this pull request May 26, 2022
#14078

Merge 2.9

#14049 [JUJU-1129] Refactor resource client api to be consistent with other juju client api
#14051 [JUJU-1125] Improve error message for local OCI image resource
#14048 [JUJU-1119] work around golang http proxy caching by default - add more logging
#14055 Added two examples to juju status help
#14058 [JUJU-1129] Refactor payload client facades to match standard practice
#14059 Update add-unit help to clarify lp#1971956
#14060 Increase the number of open file descriptors
#14057 [JUJU-1157] Check that an AgentStreamKey value exists
#14062 Remove the componentisation of resources and payloads
#14054 Update debug-log help text
#14064 [JUJU-1159] Improved help model-defaults message
#14066 Bump actions/upload-artifact from 3.0.0 to 3.1.0
#14070 [JUJU-1129] Move resources files to a single top level package
#14071 Update the model-defaults help text

Conflicts were charm and resource import paths, deleted resource files, and struct initialisations.
```
# Conflicts:
# api/client/resources/client.go
# api/client/resources/client/base_test.go
# api/client/resources/client/client_upload_test.go
# apiserver/facades/controller/caasapplicationprovisioner/provisioner_test.go
# caas/kubernetes/provider/k8s.go
# caas/kubernetes/provider/k8s_test.go
# cmd/containeragent/initialize/package_test.go
# cmd/containeragent/unit/package_test.go
# cmd/juju/application/bundle_test.go
# cmd/juju/application/deployer/bundlehandler.go
# cmd/juju/application/deployer/deployer.go
# cmd/juju/application/refresh.go
# cmd/juju/commands/main.go
# cmd/juju/commands/main_test.go
# core/watcher/package_test.go
# go.sum
# payload/api/private/helpers_test.go
# payload/context/base_test.go
# payload/context/register_test.go
# payload/context/utils.go
# resource/charmhub.go
# resource/charmstore.go
# resource/context/context.go
# resource/context/internal/content.go
# resource/context/internal/content_test.go
# resource/context/internal/resourcedir.go
# resource/context/internal/stub_test.go
# resource/context/utils.go
# resource/context/utils_test.go
# resource/repositories/mocks/mocks.go
# resource/repositories/operations.go
# resource/repositories/operations_test.go
# resource/repositories/repository.go
# resource/resource.go
# resource/resourceadapters/interfaces.go
# resource/resourceadapters/mocks/opener_mock.go
# resource/resourceadapters/opener.go
# resource/unit.go
# snap/snapcraft.yaml
# state/mocks/resources_mock.go
# worker/caasapplicationprovisioner/application_test.go
# worker/uniter/manifold.go
# worker/uniter/runner/context/contextfactory.go
# worker/uniter/runner/jujuc/mocks/context_mock.go
# worker/uniter/runner/jujuc/payload-register.go
# worker/uniter/runner/jujuc/restricted.go
# worker/uniter/runner/jujuc/server.go
# worker/uniter/uniter.go
# worker/uniter/uniter_test.go
# worker/uniter/util_test.go
```
## QA steps

See PRs


[JUJU-1129]: https://warthogs.atlassian.net/browse/JUJU-1129?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
[JUJU-1125]: https://warthogs.atlassian.net/browse/JUJU-1125?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
[JUJU-1119]: https://warthogs.atlassian.net/browse/JUJU-1119?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
[JUJU-1129]: https://warthogs.atlassian.net/browse/JUJU-1129?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
[JUJU-1157]: https://warthogs.atlassian.net/browse/JUJU-1157?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
[JUJU-1159]: https://warthogs.atlassian.net/browse/JUJU-1159?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
[JUJU-1129]: https://warthogs.atlassian.net/browse/JUJU-1129?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
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 github_actions Pull requests that update Github_actions code
Projects
None yet
2 participants