Compare commits
4 Commits
0a10ffa8ff
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
336b5d3d54
|
||
|
|
cef89303b1
|
||
|
|
842a77fb2b
|
||
|
|
957bb3a5c8
|
@@ -2,6 +2,8 @@ apiVersion: tekton.dev/v1
|
|||||||
kind: PipelineRun
|
kind: PipelineRun
|
||||||
metadata:
|
metadata:
|
||||||
name: build
|
name: build
|
||||||
|
labels:
|
||||||
|
pdb: protect
|
||||||
spec:
|
spec:
|
||||||
timeouts:
|
timeouts:
|
||||||
pipeline: "2h0m0s"
|
pipeline: "2h0m0s"
|
||||||
@@ -62,7 +64,7 @@ spec:
|
|||||||
- name: url
|
- name: url
|
||||||
value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
|
value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
|
||||||
- name: revision
|
- name: revision
|
||||||
value: "31376f29c6332ea8c378152d5ccda1ba9dbcd7bb"
|
value: "dda7b690195b43e8b9859d1caf5dcbf48588ade1"
|
||||||
- name: pathInRepo
|
- name: pathInRepo
|
||||||
value: task/git-clone/0.1/git-clone.yaml
|
value: task/git-clone/0.1/git-clone.yaml
|
||||||
resolver: git
|
resolver: git
|
||||||
@@ -101,7 +103,7 @@ spec:
|
|||||||
- name: url
|
- name: url
|
||||||
value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
|
value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
|
||||||
- name: revision
|
- name: revision
|
||||||
value: 31376f29c6332ea8c378152d5ccda1ba9dbcd7bb
|
value: dda7b690195b43e8b9859d1caf5dcbf48588ade1
|
||||||
- name: pathInRepo
|
- name: pathInRepo
|
||||||
value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
|
value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
|
||||||
params:
|
params:
|
||||||
|
|||||||
@@ -2,6 +2,8 @@ apiVersion: tekton.dev/v1
|
|||||||
kind: PipelineRun
|
kind: PipelineRun
|
||||||
metadata:
|
metadata:
|
||||||
name: foreign-document-test
|
name: foreign-document-test
|
||||||
|
labels:
|
||||||
|
pdb: protect
|
||||||
spec:
|
spec:
|
||||||
timeouts:
|
timeouts:
|
||||||
pipeline: "2h0m0s"
|
pipeline: "2h0m0s"
|
||||||
@@ -62,7 +64,7 @@ spec:
|
|||||||
- name: url
|
- name: url
|
||||||
value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
|
value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
|
||||||
- name: revision
|
- name: revision
|
||||||
value: "31376f29c6332ea8c378152d5ccda1ba9dbcd7bb"
|
value: "dda7b690195b43e8b9859d1caf5dcbf48588ade1"
|
||||||
- name: pathInRepo
|
- name: pathInRepo
|
||||||
value: task/git-clone/0.1/git-clone.yaml
|
value: task/git-clone/0.1/git-clone.yaml
|
||||||
resolver: git
|
resolver: git
|
||||||
@@ -101,7 +103,7 @@ spec:
|
|||||||
- name: url
|
- name: url
|
||||||
value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
|
value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
|
||||||
- name: revision
|
- name: revision
|
||||||
value: 31376f29c6332ea8c378152d5ccda1ba9dbcd7bb
|
value: dda7b690195b43e8b9859d1caf5dcbf48588ade1
|
||||||
- name: pathInRepo
|
- name: pathInRepo
|
||||||
value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
|
value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
|
||||||
params:
|
params:
|
||||||
|
|||||||
@@ -2,6 +2,8 @@ apiVersion: tekton.dev/v1
|
|||||||
kind: PipelineRun
|
kind: PipelineRun
|
||||||
metadata:
|
metadata:
|
||||||
name: rust-format
|
name: rust-format
|
||||||
|
labels:
|
||||||
|
pdb: protect
|
||||||
spec:
|
spec:
|
||||||
timeouts:
|
timeouts:
|
||||||
pipeline: "2h0m0s"
|
pipeline: "2h0m0s"
|
||||||
@@ -62,7 +64,7 @@ spec:
|
|||||||
- name: url
|
- name: url
|
||||||
value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
|
value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
|
||||||
- name: revision
|
- name: revision
|
||||||
value: "31376f29c6332ea8c378152d5ccda1ba9dbcd7bb"
|
value: "dda7b690195b43e8b9859d1caf5dcbf48588ade1"
|
||||||
- name: pathInRepo
|
- name: pathInRepo
|
||||||
value: task/git-clone/0.1/git-clone.yaml
|
value: task/git-clone/0.1/git-clone.yaml
|
||||||
resolver: git
|
resolver: git
|
||||||
@@ -101,7 +103,7 @@ spec:
|
|||||||
- name: url
|
- name: url
|
||||||
value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
|
value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
|
||||||
- name: revision
|
- name: revision
|
||||||
value: 31376f29c6332ea8c378152d5ccda1ba9dbcd7bb
|
value: dda7b690195b43e8b9859d1caf5dcbf48588ade1
|
||||||
- name: pathInRepo
|
- name: pathInRepo
|
||||||
value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
|
value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
|
||||||
params:
|
params:
|
||||||
|
|||||||
@@ -2,6 +2,8 @@ apiVersion: tekton.dev/v1
|
|||||||
kind: PipelineRun
|
kind: PipelineRun
|
||||||
metadata:
|
metadata:
|
||||||
name: rust-clippy
|
name: rust-clippy
|
||||||
|
labels:
|
||||||
|
pdb: protect
|
||||||
spec:
|
spec:
|
||||||
taskRunTemplate:
|
taskRunTemplate:
|
||||||
serviceAccountName: build-bot
|
serviceAccountName: build-bot
|
||||||
@@ -62,7 +64,7 @@ spec:
|
|||||||
- name: url
|
- name: url
|
||||||
value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
|
value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
|
||||||
- name: revision
|
- name: revision
|
||||||
value: "31376f29c6332ea8c378152d5ccda1ba9dbcd7bb"
|
value: "dda7b690195b43e8b9859d1caf5dcbf48588ade1"
|
||||||
- name: pathInRepo
|
- name: pathInRepo
|
||||||
value: task/git-clone/0.1/git-clone.yaml
|
value: task/git-clone/0.1/git-clone.yaml
|
||||||
resolver: git
|
resolver: git
|
||||||
@@ -101,7 +103,7 @@ spec:
|
|||||||
- name: url
|
- name: url
|
||||||
value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
|
value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
|
||||||
- name: revision
|
- name: revision
|
||||||
value: 31376f29c6332ea8c378152d5ccda1ba9dbcd7bb
|
value: dda7b690195b43e8b9859d1caf5dcbf48588ade1
|
||||||
- name: pathInRepo
|
- name: pathInRepo
|
||||||
value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
|
value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
|
||||||
params:
|
params:
|
||||||
|
|||||||
@@ -2,6 +2,8 @@ apiVersion: tekton.dev/v1
|
|||||||
kind: PipelineRun
|
kind: PipelineRun
|
||||||
metadata:
|
metadata:
|
||||||
name: rust-test
|
name: rust-test
|
||||||
|
labels:
|
||||||
|
pdb: protect
|
||||||
spec:
|
spec:
|
||||||
timeouts:
|
timeouts:
|
||||||
pipeline: "2h0m0s"
|
pipeline: "2h0m0s"
|
||||||
@@ -62,7 +64,7 @@ spec:
|
|||||||
- name: url
|
- name: url
|
||||||
value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
|
value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
|
||||||
- name: revision
|
- name: revision
|
||||||
value: "31376f29c6332ea8c378152d5ccda1ba9dbcd7bb"
|
value: "dda7b690195b43e8b9859d1caf5dcbf48588ade1"
|
||||||
- name: pathInRepo
|
- name: pathInRepo
|
||||||
value: task/git-clone/0.1/git-clone.yaml
|
value: task/git-clone/0.1/git-clone.yaml
|
||||||
resolver: git
|
resolver: git
|
||||||
@@ -101,7 +103,7 @@ spec:
|
|||||||
- name: url
|
- name: url
|
||||||
value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
|
value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
|
||||||
- name: revision
|
- name: revision
|
||||||
value: 31376f29c6332ea8c378152d5ccda1ba9dbcd7bb
|
value: dda7b690195b43e8b9859d1caf5dcbf48588ade1
|
||||||
- name: pathInRepo
|
- name: pathInRepo
|
||||||
value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
|
value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
|
||||||
params:
|
params:
|
||||||
|
|||||||
35
flake.nix
35
flake.nix
@@ -35,9 +35,9 @@
|
|||||||
pkgs = import nixpkgs {
|
pkgs = import nixpkgs {
|
||||||
inherit system overlays;
|
inherit system overlays;
|
||||||
};
|
};
|
||||||
rustToolchain =
|
rustToolchain = (pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml).override {
|
||||||
(pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml).override
|
targets = [ "wasm32-unknown-unknown" ];
|
||||||
{ targets = [ "wasm32-unknown-unknown" ]; };
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
default = pkgs.mkShell {
|
default = pkgs.mkShell {
|
||||||
@@ -96,6 +96,7 @@
|
|||||||
bindgenTarget ? null,
|
bindgenTarget ? null,
|
||||||
}:
|
}:
|
||||||
(organicScope.callPackage ./nix/package.nix {
|
(organicScope.callPackage ./nix/package.nix {
|
||||||
|
inherit rust-overlay;
|
||||||
targetBins = [
|
targetBins = [
|
||||||
"wasm"
|
"wasm"
|
||||||
];
|
];
|
||||||
@@ -128,18 +129,24 @@
|
|||||||
);
|
);
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
library = (organicScope.callPackage ./nix/package.nix { buildLib = true; }).overrideAttrs (
|
library =
|
||||||
old:
|
(organicScope.callPackage ./nix/package.nix {
|
||||||
let
|
inherit rust-overlay;
|
||||||
in
|
buildLib = true;
|
||||||
{
|
}).overrideAttrs
|
||||||
installPhase = ''
|
(
|
||||||
mkdir -p $out/lib
|
old:
|
||||||
cp target/*/release/liborganic.rlib $out/lib/
|
let
|
||||||
'';
|
in
|
||||||
}
|
{
|
||||||
);
|
installPhase = ''
|
||||||
|
mkdir -p $out/lib
|
||||||
|
cp target/*/release/liborganic.rlib $out/lib/
|
||||||
|
'';
|
||||||
|
}
|
||||||
|
);
|
||||||
devTools = organicScope.callPackage ./nix/package.nix {
|
devTools = organicScope.callPackage ./nix/package.nix {
|
||||||
|
inherit rust-overlay;
|
||||||
targetBins = [
|
targetBins = [
|
||||||
"parse"
|
"parse"
|
||||||
"compare"
|
"compare"
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
{
|
{
|
||||||
hello,
|
hello,
|
||||||
lib,
|
lib,
|
||||||
makeRustPlatform,
|
pkgs,
|
||||||
pkgsBuildHost,
|
rust-overlay,
|
||||||
|
|
||||||
targetBins ? [ ],
|
targetBins ? [ ],
|
||||||
features ? [ ],
|
features ? [ ],
|
||||||
@@ -12,34 +12,41 @@
|
|||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
cargoToml = (lib.importTOML ../Cargo.toml);
|
cargoToml = (lib.importTOML ../Cargo.toml);
|
||||||
rustToolchain = (pkgsBuildHost.rust-bin.fromRustupToolchainFile ../rust-toolchain.toml).override (
|
rustPlatformFor =
|
||||||
if cargoBuildTarget != null then
|
pkgs:
|
||||||
{
|
let
|
||||||
targets = [ cargoBuildTarget ];
|
rust-bin = rust-overlay.lib.mkRustBin { } pkgs;
|
||||||
}
|
rustToolchain = (rust-bin.fromRustupToolchainFile ../rust-toolchain.toml).override (
|
||||||
else
|
if cargoBuildTarget != null then
|
||||||
{ }
|
{
|
||||||
);
|
targets = [ cargoBuildTarget ];
|
||||||
baseRustPlatform = (
|
}
|
||||||
makeRustPlatform {
|
else
|
||||||
cargo = rustToolchain;
|
{ }
|
||||||
rustc = rustToolchain;
|
);
|
||||||
}
|
baseRustPlatform = (
|
||||||
);
|
pkgs.makeRustPlatform {
|
||||||
rustPlatform =
|
cargo = rustToolchain;
|
||||||
if cargoBuildTarget != null then
|
rustc = rustToolchain;
|
||||||
baseRustPlatform.overrideScope (
|
|
||||||
final: prev: {
|
|
||||||
cargoBuildHook = prev.cargoBuildHook.overrideDerivation (_: {
|
|
||||||
rustcTargetSpec = cargoBuildTarget;
|
|
||||||
});
|
|
||||||
cargoInstallHook = hello;
|
|
||||||
}
|
}
|
||||||
)
|
);
|
||||||
else
|
rustPlatform =
|
||||||
baseRustPlatform;
|
if cargoBuildTarget != null then
|
||||||
|
baseRustPlatform.overrideScope (
|
||||||
|
final: prev: {
|
||||||
|
cargoBuildHook = prev.cargoBuildHook.overrideDerivation (_: {
|
||||||
|
rustcTargetSpec = cargoBuildTarget;
|
||||||
|
});
|
||||||
|
cargoInstallHook = hello;
|
||||||
|
}
|
||||||
|
)
|
||||||
|
else
|
||||||
|
baseRustPlatform;
|
||||||
|
in
|
||||||
|
rustPlatform;
|
||||||
in
|
in
|
||||||
rustPlatform.buildRustPackage (
|
(rustPlatformFor pkgs).buildRustPackage (
|
||||||
|
# rustPlatform.buildRustPackage (
|
||||||
{
|
{
|
||||||
pname = "organic";
|
pname = "organic";
|
||||||
version = cargoToml.package.version;
|
version = cargoToml.package.version;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
[toolchain]
|
[toolchain]
|
||||||
channel = "nightly"
|
channel = "nightly-2026-05-23"
|
||||||
profile = "default"
|
profile = "default"
|
||||||
components = ["clippy", "rustfmt"]
|
components = ["clippy", "rustfmt"]
|
||||||
|
|||||||
Reference in New Issue
Block a user