Skip to content

Commit 5a7d033

Browse files
authored
v68 (#507)
* v68 * add `--locked` in licenses workflow * update toolchain to `1.81.0` * fix licenses
1 parent 3f1f391 commit 5a7d033

File tree

4 files changed

+94
-19
lines changed

4 files changed

+94
-19
lines changed

.github/workflows/rs_ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ jobs:
184184
# cache key contains current version of cargo-bundle-licenses
185185
# when upstream version is updated we can bump the cache key version,
186186
# to cache the latest version of the tool
187-
key: "v1-2.0.0"
187+
key: "v1-2.2.0"
188188
# cargo-bundle-licenses v2.0 doesn't understand path differences due to
189189
# sparse vs git index, so force git.
190190
- run: mkdir -p .cargo && printf "[registries.crates-io]\nprotocol = \"git\"\n" > .cargo/config.toml

bottlecap/LICENSE-3rdparty.yml

Lines changed: 91 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,7 @@ third_party_libraries:
4040
license: 0BSD OR MIT OR Apache-2.0
4141
licenses:
4242
- license: 0BSD
43-
text: |
44-
Copyright (C) Jonas Schievink <[email protected]>
45-
46-
Permission to use, copy, modify, and/or distribute this software for
47-
any purpose with or without fee is hereby granted.
48-
49-
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
50-
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
51-
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
52-
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
53-
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
54-
AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
55-
OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
43+
text: NOT FOUND
5644
- license: MIT
5745
text: |
5846
Permission is hereby granted, free of charge, to any
@@ -21481,7 +21469,46 @@ third_party_libraries:
2148121469

2148221470
END OF TERMS AND CONDITIONS
2148321471
- license: Unicode-3.0
21484-
text: NOT FOUND
21472+
text: |
21473+
UNICODE LICENSE V3
21474+
21475+
COPYRIGHT AND PERMISSION NOTICE
21476+
21477+
Copyright © 1991-2023 Unicode, Inc.
21478+
21479+
NOTICE TO USER: Carefully read the following legal agreement. BY
21480+
DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
21481+
SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
21482+
TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT
21483+
DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
21484+
21485+
Permission is hereby granted, free of charge, to any person obtaining a
21486+
copy of data files and any associated documentation (the "Data Files") or
21487+
software and any associated documentation (the "Software") to deal in the
21488+
Data Files or Software without restriction, including without limitation
21489+
the rights to use, copy, modify, merge, publish, distribute, and/or sell
21490+
copies of the Data Files or Software, and to permit persons to whom the
21491+
Data Files or Software are furnished to do so, provided that either (a)
21492+
this copyright and permission notice appear with all copies of the Data
21493+
Files or Software, or (b) this copyright and permission notice appear in
21494+
associated Documentation.
21495+
21496+
THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
21497+
KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
21498+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
21499+
THIRD PARTY RIGHTS.
21500+
21501+
IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
21502+
BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,
21503+
OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
21504+
WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
21505+
ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA
21506+
FILES OR SOFTWARE.
21507+
21508+
Except as contained in this notice, the name of a copyright holder shall
21509+
not be used in advertising or otherwise to promote the sale, use or other
21510+
dealings in these Data Files or Software without prior written
21511+
authorization of the copyright holder.
2148521512
- package_name: unsafe-libyaml
2148621513
package_version: 0.2.11
2148721514
repository: https://github.com/dtolnay/unsafe-libyaml
@@ -26816,7 +26843,31 @@ third_party_libraries:
2681626843
license: BSD-2-Clause OR Apache-2.0 OR MIT
2681726844
licenses:
2681826845
- license: BSD-2-Clause
26819-
text: NOT FOUND
26846+
text: |
26847+
Copyright 2019 The Fuchsia Authors.
26848+
26849+
Redistribution and use in source and binary forms, with or without
26850+
modification, are permitted provided that the following conditions are
26851+
met:
26852+
26853+
* Redistributions of source code must retain the above copyright
26854+
notice, this list of conditions and the following disclaimer.
26855+
* Redistributions in binary form must reproduce the above
26856+
copyright notice, this list of conditions and the following disclaimer
26857+
in the documentation and/or other materials provided with the
26858+
distribution.
26859+
26860+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
26861+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
26862+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
26863+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
26864+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
26865+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
26866+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26867+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26868+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26869+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
26870+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2682026871
- license: Apache-2.0
2682126872
text: |2+
2682226873
Apache License
@@ -27055,7 +27106,31 @@ third_party_libraries:
2705527106
license: BSD-2-Clause OR Apache-2.0 OR MIT
2705627107
licenses:
2705727108
- license: BSD-2-Clause
27058-
text: NOT FOUND
27109+
text: |
27110+
Copyright 2019 The Fuchsia Authors.
27111+
27112+
Redistribution and use in source and binary forms, with or without
27113+
modification, are permitted provided that the following conditions are
27114+
met:
27115+
27116+
* Redistributions of source code must retain the above copyright
27117+
notice, this list of conditions and the following disclaimer.
27118+
* Redistributions in binary form must reproduce the above
27119+
copyright notice, this list of conditions and the following disclaimer
27120+
in the documentation and/or other materials provided with the
27121+
distribution.
27122+
27123+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
27124+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
27125+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
27126+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
27127+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
27128+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
27129+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
27130+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27131+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27132+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27133+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2705927134
- license: Apache-2.0
2706027135
text: |2+
2706127136
Apache License

bottlecap/src/tags/lambda/tags.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ const COMPUTE_STATS_VALUE: &str = "1";
4747
// TODO(astuyve) decide what to do with the version
4848
const EXTENSION_VERSION_KEY: &str = "dd_extension_version";
4949
// TODO(duncanista) figure out a better way to not hardcode this
50-
const EXTENSION_VERSION: &str = "67-next";
50+
const EXTENSION_VERSION: &str = "68-next";
5151

5252
const REGION_KEY: &str = "region";
5353
const ACCOUNT_ID_KEY: &str = "account_id";

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[toolchain]
2-
channel = "1.78.0"
2+
channel = "1.81.0"
33
components = [ "rustfmt", "clippy" ]
44
profile = "minimal"

0 commit comments

Comments
 (0)