Skip to content

Commit

Permalink
Merge remote-tracking branches 'namada/ray/no-matchmaker-in-package' (#…
Browse files Browse the repository at this point in the history
…943) and 'namada/ray/release-include-license' (#945) into main

* namada/ray/no-matchmaker-in-package:
  changelog: add #943
  make-package.sh: don't attempt to include matchmaker

* namada/ray/release-include-license:
  changelog: add #945
  ci: install cargo-about on release step
  make-package.sh: include license information in tarball
  release: add configuration for cargo-about
  • Loading branch information
juped committed Dec 21, 2022
3 parents 914da00 + eddc2d0 + a6892e4 commit 077f088
Show file tree
Hide file tree
Showing 6 changed files with 50 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -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))
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Include license information in release binary tarballs.
([#945](https://github.com/anoma/namada/pull/945))
3 changes: 3 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
22 changes: 22 additions & 0 deletions about.hbs
Original file line number Diff line number Diff line change
@@ -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}}
17 changes: 17 additions & 0 deletions about.toml
Original file line number Diff line number Diff line change
@@ -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",
]
6 changes: 4 additions & 2 deletions scripts/make-package.sh
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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}

0 comments on commit 077f088

Please sign in to comment.