Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test-project: fixes for development of kits functionality #226

Merged
merged 4 commits into from
May 22, 2024
Merged

test-project: fixes for development of kits functionality #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
150e8ea
test-project: use latest sdk
webern May 15, 2024
33602bb
test-project: follow re-naming convention
webern May 16, 2024
1ca82dc
test-project: simulate the existence of models for now
webern May 16, 2024
6462006
test-project: add dummy sbkeys script
webern May 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tests/projects/local-kit/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tests/projects/local-kit/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ members = [
"kits/extra-1-kit",
"kits/extra-2-kit",
"kits/extra-3-kit",
"packages/pkg-a",
"packages/pkg-a-1.27",
"packages/pkg-b",
"packages/pkg-c",
"packages/pkg-d",
Expand Down
4 changes: 2 additions & 2 deletions tests/projects/local-kit/Twoliter.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ schema-version = 1
release-version = "1.0.0"

[sdk]
registry = "twoliter.alpha"
registry = "public.ecr.aws/bottlerocket"
repo = "bottlerocket-sdk"
tag = "latest"
tag = "v0.41.0"
2 changes: 1 addition & 1 deletion tests/projects/local-kit/kits/core-kit/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ build = "../build.rs"
path = "../kit.rs"

[build-dependencies]
pkg-a = { path = "../../packages/pkg-a" }
pkg-a-1_27 = { path = "../../packages/pkg-a-1.27" }
4 changes: 2 additions & 2 deletions ...jects/local-kit/packages/pkg-a/Cargo.toml → .../local-kit/packages/pkg-a-1.27/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[package]
name = "pkg-a"
name = "pkg-a-1_27"
version = "0.1.0"
edition = "2021"
publish = false
build = "../build.rs"

[package.metadata.build-package]
# Give this package an "override" name.
package-name = "pkg-a-renamed"
package-name = "pkg-a-1.27"

[lib]
path = "../packages.rs"
Expand Down
0 ...jects/local-kit/packages/pkg-a/pkg-a.spec → ...l-kit/packages/pkg-a-1.27/pkg-a-1.27.spec
View file
Open in desktop
File renamed without changes.
0 ...ojects/local-kit/packages/pkg-a/pkg-a.txt → ...s/local-kit/packages/pkg-a-1.27/pkg-a.txt
View file
Open in desktop
File renamed without changes.
4 changes: 4 additions & 0 deletions tests/projects/local-kit/sbkeys/generate-local-sbkeys
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env bash
# This file needs to exist in the project: https://github.com/bottlerocket-os/twoliter/issues/120
# TODO - delete this file when no longer needed
echo "generate-local-sbkeys script was called"
1 change: 1 addition & 0 deletions tests/projects/local-kit/sources/models/src/variant/.keep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
For the time being, this directory is needed because it gets mounted by the build Dockerfile.
2 changes: 1 addition & 1 deletion tools/buildsys/src/manifest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,7 +821,7 @@ mod test {
let cargo_metadata_path = cargo_metadata_path(&temp_dir);
let manifest = Manifest::new(manifest_path, cargo_metadata_path).unwrap();
let package_list = manifest.package_dependencies().unwrap();
let expected = vec!["pkg-a-renamed".to_string()];
let expected = vec!["pkg-a-1.27".to_string()];
assert_eq!(package_list, expected);
}

Expand Down
Loading