From 1cd57f40f62def93d0a3152b10dd5d18ce569933 Mon Sep 17 00:00:00 2001
From: strawberry <strawberry@puppygock.gay>
Date: Sun, 12 May 2024 00:22:10 -0400
Subject: [PATCH] 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>
---
.github/workflows/ci.yml | 8 ++++++++
bin/complement | 2 +-
docs/development/testing.md | 10 ++++++----
nix/pkgs/complement/default.nix | 4 ++--
4 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 88271ea51..a1c1839d8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -107,6 +107,14 @@ jobs:
- name: Run Complement tests
run: |
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
uses: actions/upload-artifact@v4
diff --git a/bin/complement b/bin/complement
index c2c6ab345..115a94e03 100755
--- a/bin/complement
+++ b/bin/complement
@@ -15,7 +15,7 @@ LOG_FILE="$2"
# A `.jsonl` file to write test results to
RESULTS_FILE="$3"
-OCI_IMAGE="complement-conduit:dev"
+OCI_IMAGE="complement-conduit:main"
toplevel="$(git rev-parse --show-toplevel)"
diff --git a/docs/development/testing.md b/docs/development/testing.md
index d48389885..680e6fb99 100644
--- a/docs/development/testing.md
+++ b/docs/development/testing.md
@@ -5,13 +5,15 @@ ## Complement
Have a look at [Complement's repository][complement] for an explanation of what
it is.
-To test against Complement, with Nix and direnv installed and set up, you can
-either:
+To test against Complement, with Nix and direnv installed and set up, you can:
* 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 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
- 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
diff --git a/nix/pkgs/complement/default.nix b/nix/pkgs/complement/default.nix
index 0399f1e82..f7bb483fd 100644
--- a/nix/pkgs/complement/default.nix
+++ b/nix/pkgs/complement/default.nix
@@ -53,7 +53,7 @@ in
dockerTools.buildImage {
name = "complement-${main.pname}";
- tag = "dev";
+ tag = "main";
copyToRoot = buildEnv {
name = "root";
@@ -81,7 +81,7 @@ dockerTools.buildImage {
Env = [
"SSL_CERT_FILE=/complement/ca/ca.crt"
- "CONDUIT_CONFIG=${./config.toml}"
+ "CONDUWUIT_CONFIG=${./config.toml}"
];
ExposedPorts = {
--
GitLab