Compare commits
27 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e89db86c83 | ||
|
|
d3cc976c26 | ||
|
|
42fe96a4c1 | ||
|
|
77a5caf54b | ||
|
|
7c7b8fbbff | ||
|
|
ab89553767 | ||
|
|
5d15c12d99 | ||
|
|
b1e766fe8f | ||
|
|
dd8fb2fac4 | ||
|
|
ab3f022734 | ||
|
|
e41de97f0a | ||
|
|
d788e00f15 | ||
|
|
356ca41f7d | ||
|
|
91d78d9182 | ||
|
|
30e7adeceb | ||
|
|
ec63efbd36 | ||
|
|
54e4a464ed | ||
|
|
d1d76ade32 | ||
|
|
2bfd2f169a | ||
|
|
42a1f46405 | ||
|
|
58c5e42ace | ||
|
|
2f68f636e2 | ||
|
|
5bd32448aa | ||
|
|
4dfe96e52b | ||
|
|
9a602122c2 | ||
|
|
b34ced72c6 | ||
|
|
aa7ccd3cba |
25
.github/workflows/lint.yml
vendored
Normal file
25
.github/workflows/lint.yml
vendored
Normal file
@@ -0,0 +1,25 @@
|
||||
name: Lint
|
||||
|
||||
on: [push, pull_request]
|
||||
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ github.token }}
|
||||
|
||||
jobs:
|
||||
lint:
|
||||
name: Check that code is lint clean using precious
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- name: Configure Git
|
||||
run: |
|
||||
git config --global user.email "jdoe@example.com"
|
||||
git config --global user.name "J. Doe"
|
||||
- name: Run install-dev-tools.sh
|
||||
run: |
|
||||
set -e
|
||||
mkdir $HOME/bin
|
||||
./dev/bin/install-dev-tools.sh
|
||||
- name: Run precious
|
||||
run: |
|
||||
PATH=$PATH:$HOME/bin precious lint -a
|
||||
218
.github/workflows/test.yml
vendored
Normal file
218
.github/workflows/test.yml
vendored
Normal file
@@ -0,0 +1,218 @@
|
||||
name: Self-test
|
||||
|
||||
on:
|
||||
push:
|
||||
pull_request:
|
||||
|
||||
jobs:
|
||||
test:
|
||||
name: Test
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
platform:
|
||||
- platform_name: FreeBSD-x86_64
|
||||
os: ubuntu-20.04
|
||||
target: x86_64-unknown-freebsd
|
||||
expect_file_re: "x86-64.+FreeBSD"
|
||||
expect_cross: "--expect-cross"
|
||||
expect_stripped: "--no-expect-stripped"
|
||||
can_test: false
|
||||
|
||||
- platform_name: Linux-x86_64
|
||||
os: ubuntu-20.04
|
||||
target: x86_64-unknown-linux-musl
|
||||
expect_file_re: "ELF.+x86-64"
|
||||
expect_cross: "--no-expect-cross"
|
||||
expect_stripped: "--expect-stripped"
|
||||
can_test: true
|
||||
|
||||
- platform_name: Linux-aarch64
|
||||
os: ubuntu-20.04
|
||||
target: aarch64-unknown-linux-musl
|
||||
expect_file_re: "aarch64"
|
||||
expect_cross: "--expect-cross"
|
||||
expect_stripped: "--no-expect-stripped"
|
||||
can_test: true
|
||||
|
||||
- platform_name: Linux-arm
|
||||
os: ubuntu-20.04
|
||||
target: arm-unknown-linux-musleabi
|
||||
expect_file_re: "32.+ARM"
|
||||
expect_cross: "--expect-cross"
|
||||
expect_stripped: "--no-expect-stripped"
|
||||
can_test: true
|
||||
|
||||
- platform_name: Linux-i586
|
||||
os: ubuntu-20.04
|
||||
target: i586-unknown-linux-musl
|
||||
expect_file_re: "ELF.+80386"
|
||||
expect_cross: "--no-expect-cross"
|
||||
expect_stripped: "--expect-stripped"
|
||||
can_test: true
|
||||
|
||||
- platform_name: Linux-mips
|
||||
os: ubuntu-20.04
|
||||
target: mips-unknown-linux-musl
|
||||
expect_file_re: "MIPS32.+mips-"
|
||||
expect_cross: "--expect-cross"
|
||||
expect_stripped: "--no-expect-stripped"
|
||||
can_test: true
|
||||
|
||||
- platform_name: Linux-mipsel
|
||||
os: ubuntu-20.04
|
||||
target: mipsel-unknown-linux-musl
|
||||
expect_file_re: "MIPS32.+mipsel-"
|
||||
expect_cross: "--expect-cross"
|
||||
expect_stripped: "--no-expect-stripped"
|
||||
can_test: true
|
||||
|
||||
- platform_name: Linux-mips64
|
||||
os: ubuntu-20.04
|
||||
target: mips64-unknown-linux-muslabi64
|
||||
expect_file_re: "MIPS64"
|
||||
expect_cross: "--expect-cross"
|
||||
expect_stripped: "--no-expect-stripped"
|
||||
can_test: true
|
||||
|
||||
- platform_name: Linux-mips64el
|
||||
os: ubuntu-20.04
|
||||
target: mips64el-unknown-linux-muslabi64
|
||||
expect_file_re: "MIPS64"
|
||||
expect_cross: "--expect-cross"
|
||||
expect_stripped: "--no-expect-stripped"
|
||||
can_test: true
|
||||
|
||||
- platform_name: Linux-powerpc
|
||||
os: ubuntu-20.04
|
||||
target: powerpc-unknown-linux-gnu
|
||||
expect_file_re: "32.+PowerPC"
|
||||
expect_cross: "--expect-cross"
|
||||
expect_stripped: "--no-expect-stripped"
|
||||
can_test: true
|
||||
|
||||
- platform_name: Linux-powerpc64
|
||||
os: ubuntu-20.04
|
||||
target: powerpc64-unknown-linux-gnu
|
||||
expect_file_re: "64.+PowerPC"
|
||||
expect_cross: "--expect-cross"
|
||||
expect_stripped: "--no-expect-stripped"
|
||||
can_test: true
|
||||
|
||||
- platform_name: Linux-powerpc64le
|
||||
os: ubuntu-20.04
|
||||
target: powerpc64le-unknown-linux-gnu
|
||||
expect_file_re: "64.+PowerPC"
|
||||
expect_cross: "--expect-cross"
|
||||
expect_stripped: "--no-expect-stripped"
|
||||
can_test: true
|
||||
|
||||
- platform_name: Linux-riscv64
|
||||
os: ubuntu-20.04
|
||||
target: riscv64gc-unknown-linux-gnu
|
||||
expect_file_re: "64.+RISC-V"
|
||||
expect_cross: "--expect-cross"
|
||||
expect_stripped: "--no-expect-stripped"
|
||||
can_test: true
|
||||
|
||||
- platform_name: Linux-s390x
|
||||
os: ubuntu-20.04
|
||||
target: s390x-unknown-linux-gnu
|
||||
expect_file_re: "64.+S/390"
|
||||
expect_cross: "--expect-cross"
|
||||
expect_stripped: "--no-expect-stripped"
|
||||
can_test: true
|
||||
|
||||
- platform_name: NetBSD-x86_64
|
||||
os: ubuntu-20.04
|
||||
target: x86_64-unknown-netbsd
|
||||
expect_file_re: "x86-64.+NetBSD"
|
||||
expect_cross: "--expect-cross"
|
||||
expect_stripped: "--no-expect-stripped"
|
||||
can_test: false
|
||||
|
||||
- platform_name: Windows-aarch64
|
||||
os: windows-latest
|
||||
target: aarch64-pc-windows-msvc
|
||||
expect_file_re: "Aarch64.+Windows"
|
||||
expect_cross: "--no-expect-cross"
|
||||
expect_stripped: "--no-expect-stripped"
|
||||
can_test: false
|
||||
|
||||
- platform_name: Windows-i686
|
||||
os: windows-latest
|
||||
target: i686-pc-windows-msvc
|
||||
expect_file_re: "80386.+Windows"
|
||||
expect_cross: "--no-expect-cross"
|
||||
expect_stripped: "--expect-stripped"
|
||||
can_test: true
|
||||
|
||||
- platform_name: Windows-x86_64
|
||||
os: windows-latest
|
||||
target: x86_64-pc-windows-msvc
|
||||
expect_file_re: "x86-64.+Windows"
|
||||
expect_stripped: "--expect-stripped"
|
||||
can_test: true
|
||||
|
||||
- platform_name: macOS-x86_64
|
||||
os: macOS-latest
|
||||
target: x86_64-apple-darwin
|
||||
expect_file_re: "Mach-O.+x86_64"
|
||||
expect_cross: "--no-expect-cross"
|
||||
expect_stripped: "--expect-stripped"
|
||||
can_test: true
|
||||
|
||||
- platform_name: macOS-aarch64
|
||||
os: macOS-latest
|
||||
target: aarch64-apple-darwin
|
||||
expect_file_re: "Mach-O.+arm64"
|
||||
expect_cross: "--no-expect-cross"
|
||||
expect_stripped: "--expect-stripped"
|
||||
can_test: false
|
||||
|
||||
runs-on: ${{ matrix.platform.os }}
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
- name: Copy test project to root
|
||||
shell: bash
|
||||
run: |
|
||||
cp -a test-project/* .
|
||||
rm -fr test-project
|
||||
- name: Run both commands
|
||||
uses: ./
|
||||
with:
|
||||
command: both
|
||||
target: ${{ matrix.platform.target }}
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
if: ${{ matrix.platform.can_test }}
|
||||
- name: Run test command
|
||||
uses: ./
|
||||
with:
|
||||
command: test
|
||||
target: ${{ matrix.platform.target }}
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
if: ${{ matrix.platform.can_test }}
|
||||
- name: Run build command
|
||||
uses: ./
|
||||
with:
|
||||
command: build
|
||||
target: ${{ matrix.platform.target }}
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
strip: true
|
||||
- name: Run build command for subdir
|
||||
uses: ./
|
||||
with:
|
||||
command: build
|
||||
working-directory: subcrate
|
||||
target: ${{ matrix.platform.target }}
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
strip: true
|
||||
- name: Check binary and cross on ${{ matrix.platform.platform_name }}
|
||||
shell: bash
|
||||
run: |
|
||||
tests/check-binary.pl \
|
||||
--target "${{ matrix.platform.target }}" \
|
||||
--expect-file-re "${{ matrix.platform.expect_file_re }}" \
|
||||
${{ matrix.platform.expect_cross }} \
|
||||
${{ matrix.platform.expect_stripped }}
|
||||
6
.gitignore
vendored
Normal file
6
.gitignore
vendored
Normal file
@@ -0,0 +1,6 @@
|
||||
/node_modules
|
||||
/package-lock.json
|
||||
/package.json
|
||||
.\#*
|
||||
\#*\#
|
||||
test-project/**/target/**
|
||||
@@ -2,17 +2,15 @@
|
||||
|
||||
## Our Pledge
|
||||
|
||||
In the interest of fostering an open and welcoming environment, we as
|
||||
contributors and maintainers pledge to making participation in our project and
|
||||
our community a harassment-free experience for everyone, regardless of age,
|
||||
body size, disability, ethnicity, gender identity and expression, level of
|
||||
experience, education, socio-economic status, nationality, personal
|
||||
appearance, race, religion, or sexual identity and orientation.
|
||||
In the interest of fostering an open and welcoming environment, we as contributors and maintainers
|
||||
pledge to making participation in our project and our community a harassment-free experience for
|
||||
everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level
|
||||
of experience, education, socio-economic status, nationality, personal appearance, race, religion,
|
||||
or sexual identity and orientation.
|
||||
|
||||
## Our Standards
|
||||
|
||||
Examples of behavior that contributes to creating a positive environment
|
||||
include:
|
||||
Examples of behavior that contributes to creating a positive environment include:
|
||||
|
||||
- Using welcoming and inclusive language
|
||||
- Being respectful of differing viewpoints and experiences
|
||||
@@ -22,53 +20,46 @@ include:
|
||||
|
||||
Examples of unacceptable behavior by participants include:
|
||||
|
||||
- The use of sexualized language or imagery and unwelcome sexual attention or
|
||||
advances
|
||||
- The use of sexualized language or imagery and unwelcome sexual attention or advances
|
||||
- Trolling, insulting/derogatory comments, and personal or political attacks
|
||||
- Public or private harassment
|
||||
- Publishing others' private information, such as a physical or electronic
|
||||
address, without explicit permission
|
||||
- Other conduct which could reasonably be considered inappropriate in a
|
||||
professional setting
|
||||
- Publishing others' private information, such as a physical or electronic address, without explicit
|
||||
permission
|
||||
- Other conduct which could reasonably be considered inappropriate in a professional setting
|
||||
|
||||
## Our Responsibilities
|
||||
|
||||
Project maintainers are responsible for clarifying the standards of acceptable
|
||||
behavior and are expected to take appropriate and fair corrective action in
|
||||
response to any instances of unacceptable behavior.
|
||||
Project maintainers are responsible for clarifying the standards of acceptable behavior and are
|
||||
expected to take appropriate and fair corrective action in response to any instances of unacceptable
|
||||
behavior.
|
||||
|
||||
Project maintainers have the right and responsibility to remove, edit, or
|
||||
reject comments, commits, code, wiki edits, issues, and other contributions
|
||||
that are not aligned to this Code of Conduct, or to ban temporarily or
|
||||
permanently any contributor for other behaviors that they deem inappropriate,
|
||||
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits,
|
||||
code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or
|
||||
to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate,
|
||||
threatening, offensive, or harmful.
|
||||
|
||||
## Scope
|
||||
|
||||
This Code of Conduct applies both within project spaces and in public spaces
|
||||
when an individual is representing the project or its community. Examples of
|
||||
representing a project or community include using an official project e-mail
|
||||
address, posting via an official social media account, or acting as an
|
||||
appointed representative at an online or offline event. Representation of a
|
||||
project may be further defined and clarified by project maintainers.
|
||||
This Code of Conduct applies both within project spaces and in public spaces when an individual is
|
||||
representing the project or its community. Examples of representing a project or community include
|
||||
using an official project e-mail address, posting via an official social media account, or acting as
|
||||
an appointed representative at an online or offline event. Representation of a project may be
|
||||
further defined and clarified by project maintainers.
|
||||
|
||||
## Enforcement
|
||||
|
||||
Instances of abusive, harassing, or otherwise unacceptable behavior may be
|
||||
reported by contacting the project team at autarch@urth.org. All complaints
|
||||
will be reviewed and investigated and will result in a response that is deemed
|
||||
necessary and appropriate to the circumstances. The project team is obligated
|
||||
to maintain confidentiality with regard to the reporter of an incident.
|
||||
Further details of specific enforcement policies may be posted separately.
|
||||
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting
|
||||
the project team at autarch@urth.org. All complaints will be reviewed and investigated and will
|
||||
result in a response that is deemed necessary and appropriate to the circumstances. The project team
|
||||
is obligated to maintain confidentiality with regard to the reporter of an incident. Further details
|
||||
of specific enforcement policies may be posted separately.
|
||||
|
||||
Project maintainers who do not follow or enforce the Code of Conduct in good
|
||||
faith may face temporary or permanent repercussions as determined by other
|
||||
members of the project's leadership.
|
||||
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face
|
||||
temporary or permanent repercussions as determined by other members of the project's leadership.
|
||||
|
||||
## Attribution
|
||||
|
||||
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
|
||||
version 1.4, available at
|
||||
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at
|
||||
https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
|
||||
|
||||
[homepage]: https://www.contributor-covenant.org
|
||||
|
||||
48
Changes.md
48
Changes.md
@@ -1,3 +1,49 @@
|
||||
## 0.0.9 - 2023-09-10
|
||||
|
||||
- Added a `working-directory` parameter. By default this is the current directory (`.`) but you can
|
||||
set it to something else to compile a single crate or workspace in a subdirectory of the repo.
|
||||
This allows you to use this action with monorepos with multiple crates. Based on GH #7 by
|
||||
@aaronvg.
|
||||
|
||||
## 0.0.8 - 2023-07-22
|
||||
|
||||
- For builds that need the `cross` binary, this binary is now cached. A cache hit saves about 20
|
||||
seconds in my tests. Suggested by @timon-schelling. GH #4.
|
||||
|
||||
## 0.0.7 - 2023-04-21
|
||||
|
||||
- The toolchain argument was (probably) not being respected with cross builds, though it's hard to
|
||||
be sure since none of the output from past CI runs I've looked at it includes the toolchain
|
||||
version in the output. But now the toolchain version is explicitly passed to all `cargo` and
|
||||
`cross` commands.
|
||||
|
||||
## 0.0.6 - 2023-04-21
|
||||
|
||||
- When the `strip` parameter was true, stripping binaries could fail if there were both
|
||||
`target/*/debug` and `target/*/release` directories present and the `debug` directory didn't have
|
||||
a binary. Now it will strip all binaries it finds under `target`.
|
||||
|
||||
## 0.0.5 - 2023-03-19
|
||||
|
||||
- Fix use of `dtolnay/rust-toolchain` action to allow passing a `toolchain` input.
|
||||
|
||||
## 0.0.4 - 2023-03-19
|
||||
|
||||
- Added a new `toolchain` parameter to allow selecting a Rust toolchain other than stable. This
|
||||
supports picking on of "stable", "beta", or "nightly".
|
||||
- Fixed binary stripping to work in more situations. Previously it depended on a very specific setup
|
||||
plus expected to be run in the context of the matrix I use for my own projects.
|
||||
- Fixed a reference to a matrix variable that should have referenced an input variable.
|
||||
|
||||
## 0.0.3 - 2023-03-17
|
||||
|
||||
- This action now supports running the `build` and `test` commands, or both, with a new input
|
||||
parameter, `command`. The default is `build`.
|
||||
|
||||
## 0.0.2 - 2023-03-05
|
||||
|
||||
- Fixed some typos in the `README.md` documentation.
|
||||
|
||||
## 0.0.1 - 2023-03-05
|
||||
|
||||
* First release upon an unsuspecting world.
|
||||
- First release upon an unsuspecting world.
|
||||
|
||||
27
README.md
27
README.md
@@ -3,7 +3,7 @@
|
||||
This action lets you easily cross-compile Rust projects using
|
||||
[cross](https://github.com/cross-rs/cross).
|
||||
|
||||
Here's an example from the release workflor for
|
||||
Here's an example from the release workflow for
|
||||
[my tool `precious`](https://github.com/houseabsolute/precious):
|
||||
|
||||
```yaml
|
||||
@@ -18,18 +18,21 @@ jobs:
|
||||
target: x86_64-unknown-freebsd
|
||||
bin: precious
|
||||
name: precious-FreeBSD-x86_64.tar.gz
|
||||
command: build
|
||||
|
||||
- release_for: Windows-x86_64
|
||||
os: windows-latest
|
||||
target: x86_64-pc-windows-msvc
|
||||
bin: precious.exe
|
||||
name: precious-Windows-x86_64.zip
|
||||
command: both
|
||||
|
||||
- release_for: macOS-x86_64
|
||||
os: macOS-latest
|
||||
target: x86_64-apple-darwin
|
||||
bin: precious
|
||||
name: precious-Darwin-x86_64.tar.gz
|
||||
command: both
|
||||
|
||||
# more release targets here ...
|
||||
|
||||
@@ -40,6 +43,7 @@ jobs:
|
||||
- name: Build binary
|
||||
uses: houseabsolute/actions-rust-cross@v0
|
||||
with:
|
||||
command: ${{ matrix.platform.command }}
|
||||
target: ${{ matrix.platform.target }}
|
||||
args: "--locked --release"
|
||||
strip: true
|
||||
@@ -51,12 +55,15 @@ jobs:
|
||||
|
||||
This action takes the following parameters:
|
||||
|
||||
| Key | Type | Required? | Description |
|
||||
| -------------- | --------------------------- | --------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
|
||||
| `target` | string | yes | The target triple to compile for. This should be one of the targets listed by running `rustup target list`. |
|
||||
| `GITHUB_TOKEN` | string | no | Defaults to the value of `${{ github.token }}`. |
|
||||
| `args` | string | no | A string-separated list of arguments to be passed to the `cross build`, like `--release --locked`. |
|
||||
| `strip` | boolean (`true` or `false`) | no | If this is true, then the resulting binary will be stripped if possible. This is only possible for binaries which weren't cross-compiled. |
|
||||
| Key | Type | Required? | Description |
|
||||
| ------------------- | ---------------------------------------------- | --------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
|
||||
| `command` | string (one of `build`, `test`, or `both`) | no | The command(s) to run. The default is `build`. Running the `test` command will fails with \*BSD targets, non-x86 Windows, and macOS ARM. |
|
||||
| `target` | string | yes | The target triple to compile for. This should be one of the targets listed by running `rustup target list`. |
|
||||
| `working-directory` | string | no | The working directory in which to run the `cargo` or `cross` commands. Defaults to the current directory (`.`). |
|
||||
| `toolchain` | string (one of `stable`, `beta`, or `nightly`) | no | The Rust toolchain version to install. The default is `stable`. |
|
||||
| `GITHUB_TOKEN` | string | no | Defaults to the value of `${{ github.token }}`. |
|
||||
| `args` | string | no | A string-separated list of arguments to be passed to `cross build`, like `--release --locked`. |
|
||||
| `strip` | boolean (`true` or `false`) | no | If this is true, then the resulting binary will be stripped if possible. This is only possible for binaries which weren't cross-compiled. |
|
||||
|
||||
## How it Works
|
||||
|
||||
@@ -77,3 +84,9 @@ corner cases, like compiling the `openssl` crate with the `vendored` feature.
|
||||
Finally, it will run `strip` to strip the binary if the `strip` parameter is true. This is only
|
||||
possible for builds that are not done via `cross`. In addition, Windows builds for `aarch64` cannot
|
||||
be stripped either.
|
||||
|
||||
## Caching Rust Compilation Output
|
||||
|
||||
You can use the [Swatinem/rust-cache](https://github.com/Swatinem/rust-cache) action with this one
|
||||
seemlessly, whether or not a specific build target needs `cross`. There is no special configuration
|
||||
that you need for this. It just works.
|
||||
|
||||
84
action.yml
84
action.yml
@@ -6,12 +6,23 @@ branding:
|
||||
description: |
|
||||
Cross compile your Rust projects with cross (https://github.com/cross-rs/cross).
|
||||
inputs:
|
||||
working-directory:
|
||||
description: The working directory for each step
|
||||
default: "."
|
||||
command:
|
||||
description: |
|
||||
The commands to run (one of "build", "test", or "both").
|
||||
default: build
|
||||
target:
|
||||
description: The target platform
|
||||
required: true
|
||||
toolchain:
|
||||
description: |
|
||||
The target toolchain to use (one of "stable", "beta", or "nightly").
|
||||
default: stable
|
||||
GITHUB_TOKEN:
|
||||
description: |
|
||||
A GitHub token, available in the secrets.GITHUB_TOKEN context variable.
|
||||
A GitHub token, available in the secrets.GITHUB_TOKEN working-directory variable.
|
||||
default: ${{ github.token }}
|
||||
args:
|
||||
description: |
|
||||
@@ -31,44 +42,73 @@ runs:
|
||||
id: determine-cross-compile
|
||||
shell: bash
|
||||
run: set-cross-compile.sh ${{ inputs.target }}
|
||||
- name: Install toolchain if not cross-compiling
|
||||
uses: dtolnay/rust-toolchain@stable
|
||||
- name: Install toolchain
|
||||
uses: dtolnay/rust-toolchain@master
|
||||
with:
|
||||
targets: ${{ matrix.platform.target }}
|
||||
if: ${{ steps.determine-cross-compile.outputs.needs-cross == 'false' }}
|
||||
- name: Install cross if cross-compiling (*nix)
|
||||
targets: ${{ inputs.target }}
|
||||
toolchain: ${{ inputs.toolchain }}
|
||||
- name: Determine latest cross version
|
||||
id: determine-latest-cross-version
|
||||
shell: bash
|
||||
run: install-cross-nix.sh
|
||||
if: ${{ steps.determine-cross-compile.outputs.needs-cross == 'true' && runner.os != 'Windows' }}
|
||||
run: determine-latest-cross-version.sh
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ inputs.GITHUB_TOKEN }}
|
||||
- name: Install cross if cross-compiling (Windows)
|
||||
shell: powershell
|
||||
run: install-cross-windows.ps1
|
||||
if: ${{ steps.determine-cross-compile.outputs.needs-cross == 'true' && runner.os == 'Windows' }}
|
||||
if: ${{ steps.determine-cross-compile.outputs.needs-cross == 'true' }}
|
||||
# We need to accesss this in both this YAML config and shell scripts. It
|
||||
# doesn't seem like using ${{ env.RUNNER_TEMP }} works in the YAML config.
|
||||
- name: Set directory for installing cross
|
||||
id: set-cross-dir
|
||||
shell: bash
|
||||
run: set-cross-dir.sh
|
||||
if: ${{ steps.determine-cross-compile.outputs.needs-cross == 'true' }}
|
||||
- name: Cache cross
|
||||
id: cache-cross
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: ${{ steps.set-cross-dir.outputs.cross-dir }}/cross
|
||||
key: ${{ runner.os }}-${{ steps.determine-latest-cross-version.outputs.cross-version }}
|
||||
if: ${{ steps.determine-cross-compile.outputs.needs-cross == 'true' }}
|
||||
- name: Install cross if cross-compiling (*nix)
|
||||
shell: bash
|
||||
run: install-cross-nix.sh ${{ steps.set-cross-dir.outputs.cross-dir }}
|
||||
if: ${{ steps.determine-cross-compile.outputs.needs-cross == 'true' && steps.cache-cross.outputs.cache-hit != 'true' }}
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ inputs.GITHUB_TOKEN }}
|
||||
- name: Set build command
|
||||
id: set-build-command
|
||||
shell: bash
|
||||
run: set-build-command.sh
|
||||
- name: Build binary (*nix)
|
||||
run: set-build-command.sh ${{ steps.set-cross-dir.outputs.cross-dir }}
|
||||
- name: Run tests (*nix)
|
||||
working-directory: ${{ inputs.working-directory }}
|
||||
shell: bash
|
||||
run: |
|
||||
${{ steps.set-build-command.outputs.build-command }} build ${{ inputs.args }} --target ${{ inputs.target }}
|
||||
if: ${{ runner.os != 'Windows' }}
|
||||
${{ steps.set-build-command.outputs.build-command }} +${{inputs.toolchain}} test ${{ inputs.args }} --target ${{ inputs.target }}
|
||||
if: ${{ inputs.command != 'build' && runner.os != 'Windows' }}
|
||||
# We want to run in Powershell on Windows to make sure we compile in a
|
||||
# native Windows environment. Some things won't compile properly under
|
||||
# msys, notably OpenSSL, which is compiled locally when using the
|
||||
# `openssl` crate with the `vendored` feature.
|
||||
- name: Build binary (Windows)
|
||||
- name: Run tests (Windows)
|
||||
working-directory: ${{ inputs.working-directory }}
|
||||
shell: powershell
|
||||
run: |
|
||||
& ${{ steps.set-build-command.outputs.build-command }} build ${{ inputs.args }} --target ${{ inputs.target }}
|
||||
if: ${{ runner.os == 'Windows' }}
|
||||
- name: Strip binary
|
||||
& ${{ steps.set-build-command.outputs.build-command }} +${{inputs.toolchain}} test ${{ inputs.args }} --target ${{ inputs.target }}
|
||||
if: ${{ inputs.command != 'build' && runner.os == 'Windows' }}
|
||||
- name: Build binary (*nix)
|
||||
working-directory: ${{ inputs.working-directory }}
|
||||
shell: bash
|
||||
run: |
|
||||
strip target/${{ matrix.platform.target }}/release/${{ matrix.platform.bin }}
|
||||
${{ steps.set-build-command.outputs.build-command }} +${{inputs.toolchain}} build ${{ inputs.args }} --target ${{ inputs.target }}
|
||||
if: ${{ inputs.command != 'test' && runner.os != 'Windows' }}
|
||||
- name: Build binary (Windows)
|
||||
working-directory: ${{ inputs.working-directory }}
|
||||
shell: powershell
|
||||
run: |
|
||||
& ${{ steps.set-build-command.outputs.build-command }} +${{inputs.toolchain}} build ${{ inputs.args }} --target ${{ inputs.target }}
|
||||
if: ${{ inputs.command != 'test' && runner.os == 'Windows' }}
|
||||
- name: Strip binary
|
||||
working-directory: ${{ inputs.working-directory }}
|
||||
shell: bash
|
||||
run: strip-binary.sh ${{ inputs.target }}
|
||||
# strip doesn't work with cross-arch binaries on Linux or Windows.
|
||||
if: ${{ inputs.strip == 'true' && steps.determine-cross-compile.outputs.needs-cross == 'false' && inputs.target != 'aarch64-pc-windows-msvc' }}
|
||||
if: ${{ inputs.command != 'test' && inputs.strip == 'true' && steps.determine-cross-compile.outputs.needs-cross == 'false' && inputs.target != 'aarch64-pc-windows-msvc' }}
|
||||
|
||||
11
determine-latest-cross-version.sh
Executable file
11
determine-latest-cross-version.sh
Executable file
@@ -0,0 +1,11 @@
|
||||
set -e
|
||||
set -x
|
||||
set -o pipefail
|
||||
|
||||
JSON=$( curl \
|
||||
--request GET \
|
||||
--header "Authorization: Bearer $GITHUB_TOKEN" \
|
||||
https://api.github.com/repos/cross-rs/cross/releases/latest )
|
||||
VERSION=$( echo "$JSON" | jq -r ".tag_name")
|
||||
|
||||
echo "cross-version=$VERSION" >> $GITHUB_OUTPUT
|
||||
46
dev/bin/install-dev-tools.sh
Executable file
46
dev/bin/install-dev-tools.sh
Executable file
@@ -0,0 +1,46 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -eo pipefail
|
||||
|
||||
function run () {
|
||||
echo $1
|
||||
eval $1
|
||||
}
|
||||
|
||||
function install_tools () {
|
||||
curl --silent --location \
|
||||
https://raw.githubusercontent.com/houseabsolute/ubi/master/bootstrap/bootstrap-ubi.sh |
|
||||
sh
|
||||
run "ubi --project houseabsolute/precious --in ~/bin"
|
||||
run "ubi --project houseabsolute/omegasort --in ~/bin"
|
||||
run "npm install prettier"
|
||||
run "curl -L https://cpanmin.us/ -o ~/bin/cpanm"
|
||||
run "chmod 0755 ~/bin/cpanm"
|
||||
run "~/bin/cpanm --sudo --notest Perl::Tidy"
|
||||
}
|
||||
|
||||
if [ "$1" == "-v" ]; then
|
||||
set -x
|
||||
fi
|
||||
|
||||
mkdir -p $HOME/bin
|
||||
|
||||
set +e
|
||||
echo ":$PATH:" | grep --extended-regexp ":$HOME/bin:" >& /dev/null
|
||||
if [ "$?" -eq "0" ]; then
|
||||
path_has_home_bin=1
|
||||
fi
|
||||
set -e
|
||||
|
||||
if [ -z "$path_has_home_bin" ]; then
|
||||
PATH=$HOME/bin:$PATH
|
||||
fi
|
||||
|
||||
install_tools
|
||||
|
||||
echo "Tools were installed into $HOME/bin."
|
||||
if [ -z "$path_has_home_bin" ]; then
|
||||
echo "You should add $HOME/bin to your PATH."
|
||||
fi
|
||||
|
||||
exit 0
|
||||
15
git/hooks/pre-commit.sh
Executable file
15
git/hooks/pre-commit.sh
Executable file
@@ -0,0 +1,15 @@
|
||||
#!/bin/bash
|
||||
|
||||
status=0
|
||||
|
||||
PRECIOUS=$(which precious)
|
||||
if [[ -z $PRECIOUS ]]; then
|
||||
PRECIOUS=./bin/precious
|
||||
fi
|
||||
|
||||
"$PRECIOUS" lint -s
|
||||
if (( $? != 0 )); then
|
||||
status+=1
|
||||
fi
|
||||
|
||||
exit $status
|
||||
26
git/setup.pl
Executable file
26
git/setup.pl
Executable file
@@ -0,0 +1,26 @@
|
||||
#!/usr/bin/env perl
|
||||
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
use Cwd qw( abs_path );
|
||||
|
||||
symlink_hook('pre-commit');
|
||||
|
||||
sub symlink_hook {
|
||||
my $hook = shift;
|
||||
|
||||
my $dot = ".git/hooks/$hook";
|
||||
my $file = "git/hooks/$hook.sh";
|
||||
my $link = "../../$file";
|
||||
|
||||
if ( -e $dot ) {
|
||||
if ( -l $dot ) {
|
||||
return if readlink $dot eq $link;
|
||||
}
|
||||
warn "You already have a hook at $dot!\n";
|
||||
return;
|
||||
}
|
||||
|
||||
symlink $link, $dot;
|
||||
}
|
||||
@@ -1,7 +1,9 @@
|
||||
set -e
|
||||
set -x
|
||||
set -o pipefail
|
||||
|
||||
cd "$RUNNER_TEMP"
|
||||
CROSS_DIR="$1"
|
||||
cd "$CROSS_DIR"
|
||||
export TARGET=.
|
||||
curl --silent --location \
|
||||
https://raw.githubusercontent.com/houseabsolute/ubi/master/bootstrap/bootstrap-ubi.sh |
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
cd $Env:RUNNER_TEMP
|
||||
Invoke-WebRequest -URI 'https://raw.githubusercontent.com/houseabsolute/ubi/master/bootstrap/bootstrap-ubi.ps1' -UseBasicParsing | Invoke-Expression
|
||||
.\ubi --project cross-rs/cross --in .
|
||||
|
||||
22
perltidyrc
Normal file
22
perltidyrc
Normal file
@@ -0,0 +1,22 @@
|
||||
-l=78
|
||||
-i=4
|
||||
-ci=4
|
||||
-se
|
||||
-b
|
||||
-bar
|
||||
-boc
|
||||
-vt=0
|
||||
-vtc=0
|
||||
-cti=0
|
||||
-pt=1
|
||||
-bt=1
|
||||
-sbt=1
|
||||
-bbt=1
|
||||
-nolq
|
||||
-npro
|
||||
-nsfs
|
||||
--blank-lines-before-packages=0
|
||||
--opening-hash-brace-right
|
||||
--no-outdent-long-comments
|
||||
--iterations=2
|
||||
-wbb="% + - * / x != == >= <= =~ !~ < > | & >= < = **= += *= &= <<= &&= -= /= |= >>= ||= .= %= ^= x="
|
||||
47
precious.toml
Normal file
47
precious.toml
Normal file
@@ -0,0 +1,47 @@
|
||||
exclude = [
|
||||
"target",
|
||||
]
|
||||
|
||||
[commands.perltidy]
|
||||
type = "both"
|
||||
include = [ "**/*.{pl,pm,t,psgi}" ]
|
||||
exclude = "tests/lib/**"
|
||||
cmd = [ "perltidy", "--profile=$PRECIOUS_ROOT/perltidyrc" ]
|
||||
lint_flags = [ "--assert-tidy", "--no-standard-output", "--outfile=/dev/null" ]
|
||||
tidy_flags = [ "--backup-and-modify-in-place", "--backup-file-extension=/" ]
|
||||
ok_exit_codes = 0
|
||||
lint_failure_exit_codes = 2
|
||||
ignore_stderr = "Begin Error Output Stream"
|
||||
|
||||
[commands.prettier-md]
|
||||
type = "both"
|
||||
include = [ "**/*.md" ]
|
||||
cmd = [ "./node_modules/.bin/prettier", "--no-config", "--print-width", "100", "--prose-wrap", "always" ]
|
||||
lint_flags = "--check"
|
||||
tidy_flags = "--write"
|
||||
ok_exit_codes = 0
|
||||
lint_failure_exit_codes = 1
|
||||
ignore_stderr = [ "Code style issues" ]
|
||||
|
||||
[commands.prettier-yml]
|
||||
type = "both"
|
||||
include = [ "**/*.yml" ]
|
||||
cmd = [ "./node_modules/.bin/prettier", "--no-config" ]
|
||||
lint_flags = "--check"
|
||||
tidy_flags = "--write"
|
||||
ok_exit_codes = 0
|
||||
lint_failure_exit_codes = 1
|
||||
ignore_stderr = [ "Code style issues" ]
|
||||
|
||||
[commands.omegasort-gitignore]
|
||||
type = "both"
|
||||
include = "**/.gitignore"
|
||||
cmd = [ "omegasort", "--sort", "path", "--unique" ]
|
||||
lint_flags = "--check"
|
||||
tidy_flags = "--in-place"
|
||||
ok_exit_codes = 0
|
||||
lint_failure_exit_codes = 1
|
||||
ignore_stderr = [
|
||||
"The .+ file is not sorted",
|
||||
"The .+ file is not unique",
|
||||
]
|
||||
@@ -1,8 +1,9 @@
|
||||
set -e
|
||||
set -x
|
||||
|
||||
if [ -f "$RUNNER_TEMP/cross" ]; then
|
||||
echo "build-command=$RUNNER_TEMP/cross" >> $GITHUB_OUTPUT
|
||||
CROSS_DIR="$1"
|
||||
if [ -f "$CROSS_DIR/cross" ]; then
|
||||
echo "build-command=$CROSS_DIR/cross" >> $GITHUB_OUTPUT
|
||||
else
|
||||
echo "build-command=cargo" >> $GITHUB_OUTPUT
|
||||
fi
|
||||
|
||||
4
set-cross-dir.sh
Executable file
4
set-cross-dir.sh
Executable file
@@ -0,0 +1,4 @@
|
||||
set -e
|
||||
set -x
|
||||
|
||||
echo "cross-dir=$RUNNER_TEMP" >> $GITHUB_OUTPUT
|
||||
33
strip-binary.sh
Executable file
33
strip-binary.sh
Executable file
@@ -0,0 +1,33 @@
|
||||
set -e
|
||||
set -x
|
||||
|
||||
TARGET=$1
|
||||
stripped=""
|
||||
|
||||
strip_binary () {
|
||||
if [[ $( uname -s ) =~ "Darwin" ]]; then
|
||||
EXE=$( find "$1" -maxdepth 1 -type f -perm +111 )
|
||||
else
|
||||
EXE=$( find "$1" -maxdepth 1 -type f -executable )
|
||||
fi
|
||||
|
||||
if [ -z "$EXE" ]; then
|
||||
echo "Could not find a binary to strip in $1"
|
||||
else
|
||||
strip "$EXE"
|
||||
stripped="$EXE"
|
||||
fi
|
||||
}
|
||||
|
||||
for type in debug release; do
|
||||
if [ -d "target/$TARGET/$type" ]; then
|
||||
strip_binary "target/$TARGET/$type"
|
||||
elif [ -d "target/$type" ]; then
|
||||
strip_binary "target/$type"
|
||||
fi
|
||||
done
|
||||
|
||||
if [ -z "$stripped" ]; then
|
||||
echo "No binaries were stripped"
|
||||
exit 1
|
||||
fi
|
||||
7
test-project/Cargo.lock
generated
Normal file
7
test-project/Cargo.lock
generated
Normal file
@@ -0,0 +1,7 @@
|
||||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
version = 3
|
||||
|
||||
[[package]]
|
||||
name = "test-project"
|
||||
version = "0.1.0"
|
||||
6
test-project/Cargo.toml
Normal file
6
test-project/Cargo.toml
Normal file
@@ -0,0 +1,6 @@
|
||||
[package]
|
||||
name = "test-project"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
11
test-project/src/main.rs
Normal file
11
test-project/src/main.rs
Normal file
@@ -0,0 +1,11 @@
|
||||
fn main() {
|
||||
println!("Hello, world!");
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod test {
|
||||
#[test]
|
||||
fn test_something() {
|
||||
assert_eq!(1, 1);
|
||||
}
|
||||
}
|
||||
7
test-project/subcrate/Cargo.lock
generated
Normal file
7
test-project/subcrate/Cargo.lock
generated
Normal file
@@ -0,0 +1,7 @@
|
||||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
version = 3
|
||||
|
||||
[[package]]
|
||||
name = "subcrate"
|
||||
version = "0.1.0"
|
||||
8
test-project/subcrate/Cargo.toml
Normal file
8
test-project/subcrate/Cargo.toml
Normal file
@@ -0,0 +1,8 @@
|
||||
[package]
|
||||
name = "subcrate"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
|
||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
[dependencies]
|
||||
3
test-project/subcrate/src/main.rs
Normal file
3
test-project/subcrate/src/main.rs
Normal file
@@ -0,0 +1,3 @@
|
||||
fn main() {
|
||||
println!("Hello, world (subcrate)!");
|
||||
}
|
||||
100
tests/check-binary.pl
Executable file
100
tests/check-binary.pl
Executable file
@@ -0,0 +1,100 @@
|
||||
#!/usr/bin/env perl
|
||||
|
||||
use v5.30;
|
||||
use strict;
|
||||
use warnings;
|
||||
no warnings 'experimental::signatures';
|
||||
use feature 'signatures';
|
||||
use autodie;
|
||||
|
||||
use FindBin qw( $Bin );
|
||||
use File::Spec;
|
||||
use lib File::Spec->catdir( $Bin, 'lib' );
|
||||
|
||||
use Getopt::Long;
|
||||
use IPC::System::Simple qw( capturex );
|
||||
use Path::Tiny qw( path );
|
||||
use Test::More;
|
||||
|
||||
sub main {
|
||||
my $target;
|
||||
my $expect_cross;
|
||||
my $expect_file_re;
|
||||
my $expect_stripped;
|
||||
|
||||
GetOptions(
|
||||
'target=s' => \$target,
|
||||
'expect-file-re=s' => \$expect_file_re,
|
||||
'expect-cross!' => \$expect_cross,
|
||||
'expect-stripped!' => \$expect_stripped,
|
||||
);
|
||||
|
||||
check_cross( path( $ENV{RUNNER_TEMP} ), $expect_cross );
|
||||
|
||||
for my $bin (
|
||||
path( qw( . target ), $target, qw( debug test-project ) ),
|
||||
path( qw( . subcrate target ), $target, qw( debug subcrate ) )
|
||||
) {
|
||||
check_binary( $bin, $expect_file_re, $expect_stripped );
|
||||
}
|
||||
|
||||
done_testing();
|
||||
}
|
||||
|
||||
sub check_cross ( $bin_dir, $expect_cross ) {
|
||||
my $cross = $bin_dir->child('cross');
|
||||
if ($expect_cross) {
|
||||
ok( $cross->is_file && -x $cross, 'found `cross` in $PATH' );
|
||||
}
|
||||
else {
|
||||
ok( !$cross->exists, 'did not find `cross` in $PATH' );
|
||||
}
|
||||
}
|
||||
|
||||
sub check_binary ( $bin, $expect_file_re, $expect_stripped ) {
|
||||
ok( $bin->exists, "Binary at $bin exists" )
|
||||
or return;
|
||||
ok( $bin->is_file, "Binary at $bin is a file" )
|
||||
or return;
|
||||
ok( -x $bin, "Binary at $bin is executable" )
|
||||
or return;
|
||||
|
||||
my $file = capturex( qw( file --brief ), $bin ) // q{};
|
||||
chomp $file;
|
||||
|
||||
like(
|
||||
$file, qr/$expect_file_re/,
|
||||
"`file` output for $bin matches expected output"
|
||||
);
|
||||
|
||||
# The file command on macOS doesn't report whether the binary is stripped
|
||||
# or not.
|
||||
return if $^O eq 'darwin';
|
||||
|
||||
if ($expect_stripped) {
|
||||
unlike(
|
||||
$file, qr/not stripped/,
|
||||
"`file` does not report $bin as not stripped"
|
||||
);
|
||||
like( $file, qr/stripped/, "`file` reports $bin as stripped" );
|
||||
}
|
||||
else {
|
||||
if ( $^O eq 'MSWin32' || $^O eq 'msys' ) {
|
||||
|
||||
# On Windows, unstripped binaries don't contain the word
|
||||
# "stripped" at all.
|
||||
unlike(
|
||||
$file, qr/stripped/,
|
||||
"`file` does not report $bin as stripped"
|
||||
);
|
||||
}
|
||||
else {
|
||||
like(
|
||||
$file, qr/not stripped/,
|
||||
"`file` reports $bin as not stripped"
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
main();
|
||||
49
tests/check-binary.sh
Executable file
49
tests/check-binary.sh
Executable file
@@ -0,0 +1,49 @@
|
||||
set -e
|
||||
set -x
|
||||
|
||||
TARGET=$1
|
||||
EXPECT_CROSS=$2
|
||||
EXPECT_FILE_RE=$3
|
||||
EXPECT_STRIPPED=$4
|
||||
|
||||
if [ "$EXPECT_CROSS" == "true" ]; then
|
||||
if [ ! -f "$RUNNER_TEMP/cross" ]; then
|
||||
echo "Could not find cross in path: $PATH"
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
if [ -f "$RUNNER_TEMP/cross" ]; then
|
||||
echo "Found cross in path: $PATH"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
FILE=$(file --brief ./target/$TARGET/debug/test-project)
|
||||
if [[ "$FILE" =~ $EXPECT_FILE_RE ]]; then
|
||||
echo "file output matches $EXPECT_FILE_RE"
|
||||
else
|
||||
echo "file output does not match $EXPECT_FILE_RE"
|
||||
exit 2
|
||||
fi
|
||||
|
||||
if [[ $( uname -s ) =~ "Darwin" ]]; then
|
||||
# File on macOS doesn't report whether the binary is stripped or not.
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [[ "$FILE" =~ "not stripped" ]]; then
|
||||
echo "binary was not stripped"
|
||||
GOT_STRIPPED="false"
|
||||
elif [[ "$FILE" =~ "stripped" ]]; then
|
||||
echo "binary was stripped"
|
||||
GOT_STRIPPED="true"
|
||||
else
|
||||
# On Windows the aarch64 binary's file info doesn't include the word
|
||||
# "stripped" at all.
|
||||
echo "binary was not stripped"
|
||||
GOT_STRIPPED="false"
|
||||
fi
|
||||
|
||||
if [ "$EXPECT_STRIPPED" != "$GOT_STRIPPED" ]; then
|
||||
exit 3
|
||||
fi
|
||||
1115
tests/lib/IPC/System/Simple.pm
Normal file
1115
tests/lib/IPC/System/Simple.pm
Normal file
File diff suppressed because it is too large
Load Diff
3880
tests/lib/Path/Tiny.pm
Normal file
3880
tests/lib/Path/Tiny.pm
Normal file
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user