Skip to content

Commit f1dbe13

Browse files
committed
Fix test
1 parent 7105033 commit f1dbe13

File tree

2 files changed

+8
-17
lines changed

2 files changed

+8
-17
lines changed

.github/workflows/test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ jobs:
4040
4141
- name: Run check w/rust-toolchain.toml
4242
run: |
43-
mv ./test/rt.toml ./test/rust-toolchain.toml
44-
docker run -v $PWD/test:/test test-cargo-deny \
43+
mv ./test/rt.toml ./rust-toolchain.toml
44+
docker run -v $PWD:/test test-cargo-deny \
4545
"" \
4646
"" \
4747
"" \

entrypoint.sh

+6-15
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,14 @@ set -e
33

44
PATH=$PATH:/usr/local/cargo/bin
55

6-
if [ -n "$1" ]
7-
then
6+
if [ -n "$1" ]; then
87
rustup set profile minimal
98
rustup default "$1"
109
fi
1110

1211
rustup toolchain install
1312

14-
if [ -n "$2" ]
15-
then
13+
if [ -n "$2" ]; then
1614
git config --global credential.helper store
1715
git config --global --replace-all url.https://github.com/.insteadOf ssh://[email protected]/
1816
git config --global --add url.https://github.com/.insteadOf [email protected]:
@@ -21,32 +19,25 @@ then
2119
chmod 600 "$HOME/.git-credentials"
2220
fi
2321

24-
if [ -n "$3" ]
25-
then
22+
if [ -n "$3" ]; then
2623
mkdir -p "/root/.ssh"
2724
chmod 0700 "/root/.ssh"
2825
echo "${3}" > "/root/.ssh/id_rsa"
2926
chmod 0600 "/root/.ssh/id_rsa"
3027
fi
3128

32-
if [ -n "$4" ]
33-
then
29+
if [ -n "$4" ]; then
3430
mkdir -p "/root/.ssh"
3531
chmod 0700 "/root/.ssh"
3632
echo "${4}" > "/root/.ssh/known_hosts"
3733
chmod 0600 "/root/.ssh/known_hosts"
3834
fi
3935

40-
if [ -n "$5" ]
41-
then
36+
if [ -n "$5" ]; then
4237
export CARGO_NET_GIT_FETCH_WITH_CLI="$5"
4338
fi
4439

45-
shift
46-
shift
47-
shift
48-
shift
49-
shift
40+
shift 5
5041

5142
# Due to how github actions run containers we need to explicitly force colors
5243
# as TTY detection fails inside them

0 commit comments

Comments
 (0)