Skip to content

Commit 358034c

Browse files
committed
Merge branch 'develop' into 543-s3-uploads
2 parents 7c6bda1 + 878becd commit 358034c

File tree

252 files changed

+8100
-3524
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

252 files changed

+8100
-3524
lines changed

.github/workflows/main.yml

+8-7
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,12 @@ jobs:
2626
github-token: ${{ secrets.GITHUB_TOKEN }}
2727
- name: Earthly build, test
2828
run: earthly --org ontola --ci --sat henk -P +pipeline
29-
- name: Convert newline-separated list to space-separated
30-
id: format_tags
31-
run: |
32-
SPACE_SEPARATED_TAGS=$(echo "${{ steps.meta.outputs.tags }}" | tr '\n' ' ')
33-
echo "SPACE_SEPARATED_TAGS=$SPACE_SEPARATED_TAGS" >> $GITHUB_ENV
34-
echo "Space-separated tags: "
29+
# - name: Convert newline-separated list to space-separated
30+
# id: format_tags
31+
# run: |
32+
# SPACE_SEPARATED_TAGS=$(echo "${{ steps.meta.outputs.tags }}" | tr '\n' ' ')
33+
# echo "steps.meta.output.tags=${{ steps.meta.outputs.tags }}"
34+
# echo "SPACE_SEPARATED_TAGS=$SPACE_SEPARATED_TAGS" >> $GITHUB_ENV
35+
# echo "Space-separated tags: $SPACE_SEPARATED_TAGS"
3536
- name: Earthly build and push docker
36-
run: earthly --org ontola --ci --sat henk -P --push +docker-all --tags="$SPACE_SEPARATED_TAGS"
37+
run: earthly --org ontola --ci --sat henk -P --push +docker-all --tags="${{ steps.meta.outputs.tags }}"

.vscode/recommendations.json

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"ms-vscode.vscode-typescript-next",
66
"dbaeumer.vscode-eslint",
77
"antfu.vite",
8+
"DavidAnson.vscode-markdownlint",
89
"ms-playwright.playwright"
910
]
1011
}

CHANGELOG.md

+8-3
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,22 @@ By far most changes relate to `atomic-server`, so if not specified, assume the c
55
**Changes to JS assets (including the front-end and JS libraries) are not shown here**, but in [`/browser/CHANGELOG`](/browser/CHANGELOG.md).
66
See [STATUS.md](server/STATUS.md) to learn more about which features will remain stable.
77

8-
## [v0.36.2] - 2024-01-05
8+
## [UNRELEASED]
99

10+
- Remove `process-management` feature #324 #334
11+
12+
## [v0.37.0] - 2024-02-01
13+
14+
- Refactor `atomic_lib::Resource` propval methods (e.g. `set_propval` => `set`), make them chainable. #822
15+
- Make `set_propval` and `set_propval_shortname` chainable #785
16+
- Deterministic serialization JSON AD #794
1017
- Use `musl` + `alpine` builds for docker images, way smaller images #620
1118
- Support multi-platform docker builds #731
1219
- Remove deprecated ENV vars #732
1320
- Fix no Agent as drive
1421
- Add `clear` option to error component (resets all front-end state)
1522
- Add `Agent::from_secret` #785
16-
- Make `set_propval` and `set_propval_shortname` chainable #785
1723
- Don't use default agent when fetching with Db #787
18-
- Deterministic serialization JSON AD #794
1924
- Fix HTTPS / TLS setup #768
2025

2126
## [v0.36.1] - 2023-12-06

CONTRIBUTE.md CONTRIBUTING.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,11 @@ So please first send an e-mail to [email protected] describing the issue, and then
200200

201201
1. Commit changes
202202
1. Make sure all tests run properly
203-
1. Use `cargo workspaces version patch` (and maybe replace `patch` with the `minor`) to update all `cargo.toml` files in one command. You'll need to `cargo install cargo-workspaces` if this command is not possible.
203+
1. Test, build and update the `/browser` versions (`package.json` files, see contribute.md)
204+
1. Use `cargo workspaces version patch --no-git-commit` (and maybe replace `patch` with the `minor`) to update all `cargo.toml` files in one command. You'll need to `cargo install cargo-workspaces` if this command is not possible.
205+
1. Publish to cargo: `cargo publish`. First `lib`, then `cli` and `server`.
206+
1. Publish to `npm` (see `browser/contribute.md`)
207+
1. Update the `CHANGELOG.md` files (browser and root)
204208

205209
The following should be triggered automatically:
206210

0 commit comments

Comments
 (0)