diff --git a/.changelog/unreleased/miscellaneous/943-no-matchmaker-in-package.md b/.changelog/unreleased/miscellaneous/943-no-matchmaker-in-package.md new file mode 100644 index 0000000000..13758711e4 --- /dev/null +++ b/.changelog/unreleased/miscellaneous/943-no-matchmaker-in-package.md @@ -0,0 +1,2 @@ +- Don't attempt to include matchmaker DLLs, which no longer exist, in release + packages. ([#943](https://github.com/anoma/namada/pull/943)) \ No newline at end of file diff --git a/.changelog/unreleased/miscellaneous/945-release-include-license.md b/.changelog/unreleased/miscellaneous/945-release-include-license.md new file mode 100644 index 0000000000..55d0b60f60 --- /dev/null +++ b/.changelog/unreleased/miscellaneous/945-release-include-license.md @@ -0,0 +1,2 @@ +- Include license information in release binary tarballs. + ([#945](https://github.com/anoma/namada/pull/945)) \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 114ca0455d..9de90b80a2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -72,6 +72,9 @@ jobs: ~/.cargo/git key: ${{ runner.os }}-namada-release-${{ matrix.namada_cache_version }}-${{ hashFiles('**/Cargo.lock') }} restore-keys: ${{ runner.os }}-namada-release-${{ matrix.namada_cache_version }} + - name: Install cargo-about + run: | + cargo install --version 0.5.2 cargo-about - name: Start sccache server run: sccache --start-server - name: ${{ matrix.make.name }} diff --git a/about.hbs b/about.hbs new file mode 100644 index 0000000000..8dc9490c5d --- /dev/null +++ b/about.hbs @@ -0,0 +1,22 @@ +Third Party Licenses + +Overview of licenses: + +{{#each overview}} +{{{name}}} ({{count}}) +{{/each}} + +All license text: + +{{#each licenses}} +{{{name}}} + +Used by: + +{{#each used_by}} +{{crate.name}} {{crate.version}} +<{{#if crate.repository}}{{crate.repository}}{{else}}https://crates.io/crates/{{crate.name}}{{/if}}> +{{/each}} + +{{{text}}} +{{/each}} diff --git a/about.toml b/about.toml new file mode 100644 index 0000000000..d080250749 --- /dev/null +++ b/about.toml @@ -0,0 +1,17 @@ +accepted = [ + "MIT", + "0BSD", + "ISC", + "Unlicense", + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "MPL-2.0", + "GPL-3.0", + "OSL-3.0", + "OpenSSL", + "Unicode-DFS-2016", + "Apache-2.0 WITH LLVM-exception", + "Apache-2.0", + "NOASSERTION", +] diff --git a/scripts/make-package.sh b/scripts/make-package.sh index 8ae06589bb..90a0429fee 100755 --- a/scripts/make-package.sh +++ b/scripts/make-package.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash # Make a release archive from built Namada binaries and dylib(s) +# depends on cargo-about 0.5.2 set -e @@ -11,8 +12,9 @@ BIN="namada namadac namadan namadaw" mkdir -p ${PACKAGE_NAME} && \ cd target/release && \ -MM_TOKEN_EXCH=$(find . -maxdepth 1 -name 'libmm_token_exch.so' -or -name 'libmm_token_exch.dll' -or -name 'libmm_token_exch.dylib') && \ -ln ${BIN} ${MM_TOKEN_EXCH} ../../${PACKAGE_NAME} && \ +ln ${BIN} ../../${PACKAGE_NAME} && \ cd ../.. && \ +ln LICENSE ${PACKAGE_NAME} && \ +cargo about generate about.hbs > ${PACKAGE_NAME}/LICENSE.thirdparty && \ tar -c -z -f ${PACKAGE_NAME}.tar.gz ${PACKAGE_NAME} && \ rm -rf ${PACKAGE_NAME}