upload complement OCI image from CI, document where it can be found, use main
instead of dev
for tag
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
parent
da9a0eb77b
commit
1cd57f40f6
4 changed files with 17 additions and 7 deletions
8
.github/workflows/ci.yml
vendored
8
.github/workflows/ci.yml
vendored
|
@ -107,6 +107,14 @@ jobs:
|
||||||
- name: Run Complement tests
|
- name: Run Complement tests
|
||||||
run: |
|
run: |
|
||||||
direnv exec . bin/complement 'complement_src' 'complement_test_logs.jsonl' 'complement_test_results.jsonl'
|
direnv exec . bin/complement 'complement_src' 'complement_test_logs.jsonl' 'complement_test_results.jsonl'
|
||||||
|
cp -v -f result complement_oci_image.tar.gz
|
||||||
|
|
||||||
|
- name: Upload Complement OCI image
|
||||||
|
uses: actions/upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: complement_oci_image.tar.gz
|
||||||
|
path: complement_oci_image.tar.gz
|
||||||
|
if-no-files-found: error
|
||||||
|
|
||||||
- name: Upload Complement logs
|
- name: Upload Complement logs
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
|
|
|
@ -15,7 +15,7 @@ LOG_FILE="$2"
|
||||||
# A `.jsonl` file to write test results to
|
# A `.jsonl` file to write test results to
|
||||||
RESULTS_FILE="$3"
|
RESULTS_FILE="$3"
|
||||||
|
|
||||||
OCI_IMAGE="complement-conduit:dev"
|
OCI_IMAGE="complement-conduit:main"
|
||||||
|
|
||||||
toplevel="$(git rev-parse --show-toplevel)"
|
toplevel="$(git rev-parse --show-toplevel)"
|
||||||
|
|
||||||
|
|
|
@ -5,13 +5,15 @@
|
||||||
Have a look at [Complement's repository][complement] for an explanation of what
|
Have a look at [Complement's repository][complement] for an explanation of what
|
||||||
it is.
|
it is.
|
||||||
|
|
||||||
To test against Complement, with Nix and direnv installed and set up, you can
|
To test against Complement, with Nix and direnv installed and set up, you can:
|
||||||
either:
|
|
||||||
|
|
||||||
* Run `./bin/complement "$COMPLEMENT_SRC" ./path/to/logs.jsonl ./path/to/results.jsonl`
|
* Run `./bin/complement "$COMPLEMENT_SRC" ./path/to/logs.jsonl ./path/to/results.jsonl`
|
||||||
to build a Complement image, run the tests, and output the logs and results
|
to build a Complement image, run the tests, and output the logs and results
|
||||||
to the specified paths
|
to the specified paths. This will also output the OCI image at `result`
|
||||||
* Run `nix build .#complement` from the root of the repository to just build a
|
* Run `nix build .#complement` from the root of the repository to just build a
|
||||||
Complement image
|
Complement OCI image outputted to `result` (it's a `.tar.gz` file)
|
||||||
|
* Or download the latest Complement OCI image from the CI workflow artifacts output
|
||||||
|
from the commit/revision you want to test (e.g. from main) [here][ci-workflows]
|
||||||
|
|
||||||
|
[ci-workflows]: https://github.com/girlbossceo/conduwuit/actions/workflows/ci.yml?query=event%3Apush+is%3Asuccess+actor%3Agirlbossceo
|
||||||
[complement]: https://github.com/matrix-org/complement
|
[complement]: https://github.com/matrix-org/complement
|
||||||
|
|
|
@ -53,7 +53,7 @@ in
|
||||||
|
|
||||||
dockerTools.buildImage {
|
dockerTools.buildImage {
|
||||||
name = "complement-${main.pname}";
|
name = "complement-${main.pname}";
|
||||||
tag = "dev";
|
tag = "main";
|
||||||
|
|
||||||
copyToRoot = buildEnv {
|
copyToRoot = buildEnv {
|
||||||
name = "root";
|
name = "root";
|
||||||
|
@ -81,7 +81,7 @@ dockerTools.buildImage {
|
||||||
|
|
||||||
Env = [
|
Env = [
|
||||||
"SSL_CERT_FILE=/complement/ca/ca.crt"
|
"SSL_CERT_FILE=/complement/ca/ca.crt"
|
||||||
"CONDUIT_CONFIG=${./config.toml}"
|
"CONDUWUIT_CONFIG=${./config.toml}"
|
||||||
];
|
];
|
||||||
|
|
||||||
ExposedPorts = {
|
ExposedPorts = {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue