Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
redox
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pirson Bethancourt
redox
Commits
b86622d7
Verified
Commit
b86622d7
authored
1 year ago
by
mattmadeofpasta
Browse files
Options
Downloads
Patches
Plain Diff
Add `just` to the build dependencies
parent
15d94b2f
No related branches found
No related tags found
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
.gitlab-ci.yml
+1
-0
1 addition, 0 deletions
.gitlab-ci.yml
bootstrap.sh
+1
-0
1 addition, 0 deletions
bootstrap.sh
docker/Dockerfile
+1
-0
1 addition, 0 deletions
docker/Dockerfile
mk/depends.mk
+5
-0
5 additions, 0 deletions
mk/depends.mk
podman/rustinstall.sh
+1
-0
1 addition, 0 deletions
podman/rustinstall.sh
with
9 additions
and
0 deletions
.gitlab-ci.yml
+
1
−
0
View file @
b86622d7
...
@@ -36,6 +36,7 @@ img:
...
@@ -36,6 +36,7 @@ img:
-
|
-
|
source "$HOME/.cargo/env" &&
source "$HOME/.cargo/env" &&
cargo install --version 0.1.1 cargo-config &&
cargo install --version 0.1.1 cargo-config &&
cargo install --version 1.16.0 just &&
cargo build --manifest-path installer/Cargo.toml --release &&
cargo build --manifest-path installer/Cargo.toml --release &&
make ci-img IMG_TAG=$CI_COMMIT_REF_NAME REPO_BINARY=1
make ci-img IMG_TAG=$CI_COMMIT_REF_NAME REPO_BINARY=1
artifacts
:
artifacts
:
...
...
This diff is collapsed.
Click to expand it.
bootstrap.sh
+
1
−
0
View file @
b86622d7
...
@@ -914,6 +914,7 @@ else
...
@@ -914,6 +914,7 @@ else
fi
fi
cargoInstall cargo-config 0.1.1
cargoInstall cargo-config 0.1.1
cargoInstall just 1.16.0
if
[
"
$dependenciesonly
"
=
false
]
;
then
if
[
"
$dependenciesonly
"
=
false
]
;
then
boot
boot
...
...
This diff is collapsed.
Click to expand it.
docker/Dockerfile
+
1
−
0
View file @
b86622d7
...
@@ -31,6 +31,7 @@ RUN set -ex; \
...
@@ -31,6 +31,7 @@ RUN set -ex; \
x86-64-unknown-redox-gcc
\
x86-64-unknown-redox-gcc
\
;
\
;
\
cargo
install
cargo-config
;
\
cargo
install
cargo-config
;
\
cargo
install
just@1.16.0
;
\
apt-get autoremove
-q
-y
;
\
apt-get autoremove
-q
-y
;
\
apt-get clean
-q
-y
;
\
apt-get clean
-q
-y
;
\
rm
-rf
/var/lib/apt/lists/
*
rm
-rf
/var/lib/apt/lists/
*
...
...
This diff is collapsed.
Click to expand it.
mk/depends.mk
+
5
−
0
View file @
b86622d7
...
@@ -16,4 +16,9 @@ ifeq ($(shell env -u RUSTUP_TOOLCHAIN cargo install --list | grep '^cargo-config
...
@@ -16,4 +16,9 @@ ifeq ($(shell env -u RUSTUP_TOOLCHAIN cargo install --list | grep '^cargo-config
$(
error
cargo-config
$(
CARGO_CONFIG_VERSION
)
not found, run
"cargo install --force --version
$(
CARGO_CONFIG_VERSION
)
cargo-config"
)
$(
error
cargo-config
$(
CARGO_CONFIG_VERSION
)
not found, run
"cargo install --force --version
$(
CARGO_CONFIG_VERSION
)
cargo-config"
)
endif
endif
JUST_VERSION
=
1.16.0
ifeq
($(shell env -u RUSTUP_TOOLCHAIN cargo install --list | grep '^just v$(JUST_VERSION):$$'),)
$(
error
just
$(
JUST_VERSION
)
not found, run
"cargo install --force --version
$(
JUST_VERSION
)
just"
)
endif
endif
endif
This diff is collapsed.
Click to expand it.
podman/rustinstall.sh
+
1
−
0
View file @
b86622d7
...
@@ -4,3 +4,4 @@
...
@@ -4,3 +4,4 @@
curl https://sh.rustup.rs
-sSf
| sh
-s
--
-y
--default-toolchain
nightly
curl https://sh.rustup.rs
-sSf
| sh
-s
--
-y
--default-toolchain
nightly
cargo
install
--force
--version
0.1.1 cargo-config
cargo
install
--force
--version
0.1.1 cargo-config
cargo
install
--force
--version
1.16.0 just
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment