Skip to content

Commit a08832e

Browse files
committed
Replace japaric-trust/crate_install.sh with mdBook install script
1 parent fa70f61 commit a08832e

File tree

5 files changed

+41
-370
lines changed

5 files changed

+41
-370
lines changed

docs/book/Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ROOT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
1717
TOOLS_DIR := $(realpath ../../hack/tools)
1818
TOOLS_BIN_DIR := $(TOOLS_DIR)/bin
1919
BIN_DIR := bin
20-
CRATE_INSTALL := $(realpath ../../third_party/japaric-trust/crate_install.sh)
20+
MDBOOK_INSTALL := $(realpath ../../scripts/ci-install-mdbook.sh)
2121

2222
export PATH := $(TOOLS_BIN_DIR):$(PATH)
2323

@@ -34,9 +34,10 @@ RELEASELINK := $(TOOLS_BIN_DIR)/mdbook-releaselink
3434
$(RELEASELINK): $(TOOLS_DIR)/go.mod
3535
cd $(TOOLS_DIR); go build -tags=tools -o $(BIN_DIR)/mdbook-releaselink ./mdbook/releaselink
3636

37-
MDBOOK := $(TOOLS_BIN_DIR)/mdbook
37+
# Only set MDBOOK if it's not set as an environment variable
38+
MDBOOK ?= $(TOOLS_BIN_DIR)/mdbook
3839
$(MDBOOK):
39-
$(CRATE_INSTALL) --git rust-lang/mdBook --tag v0.4.11 --to $(TOOLS_BIN_DIR) --force
40+
$(MDBOOK_INSTALL) v0.4.11 $(TOOLS_BIN_DIR)
4041

4142
RUNTIME_OPENAPI_GEN_BIN := runtime-openapi-gen
4243
RUNTIME_OPENAPI_GEN := $(abspath $(TOOLS_BIN_DIR)/$(RUNTIME_OPENAPI_GEN_BIN))

scripts/ci-install-mdbook.sh

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#!/bin/bash
2+
3+
# Copyright 2022 The Kubernetes Authors.
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
17+
set -o errexit
18+
set -o nounset
19+
set -o pipefail
20+
21+
VERSION=${1}
22+
OUTPUT_PATH=${2}
23+
24+
# Ensure the output folder exists
25+
mkdir -p "${OUTPUT_PATH}"
26+
27+
# Get what release to download
28+
RELEASE_NAME=""
29+
case "$OSTYPE" in
30+
darwin*) RELEASE_NAME="x86_64-apple-darwin.tar.gz" ;;
31+
linux*) RELEASE_NAME="x86_64-unknown-linux-gnu.tar.gz" ;;
32+
# msys*) echo "WINDOWS" ;;
33+
*) echo "No mdBook release available for: $OSTYPE" && exit 1;;
34+
esac
35+
36+
# Download and extract the mdBook release
37+
curl -L "https://github.com/rust-lang/mdBook/releases/download/${VERSION}/mdbook-${VERSION}-${RELEASE_NAME}" | tar -xvz -C "${OUTPUT_PATH}"

third_party/README.md

Lines changed: 0 additions & 2 deletions
This file was deleted.

third_party/japaric-trust/LICENSE-APACHE

Lines changed: 0 additions & 201 deletions
This file was deleted.

0 commit comments

Comments
 (0)