Skip to content

Commit 4e80afd

Browse files
committed
fix: update help msg after rm llvm deps
1 parent 0036198 commit 4e80afd

File tree

5 files changed

+22
-67
lines changed

5 files changed

+22
-67
lines changed

.github/workflows/brew_release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ jobs:
3333

3434
# Custom dependencies in case other formulas are needed to build the current one.
3535
# Optional - multiline string.
36-
depends_on: |
37-
"llvm@14"
36+
# depends_on: |
37+
# "llvm@14"
3838
# Custom install command for your formula.
3939
# Required - string.
4040
install: |

.github/workflows/release.yml

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,8 @@ jobs:
5050
target/
5151
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
5252

53-
- name: Cache LLVM and Clang
54-
id: cache-llvm
55-
uses: actions/cache@v2
56-
with:
57-
path: ${{ runner.temp }}/llvm
58-
key: llvm-14
59-
- name: Install LLVM and Clang
60-
if: ${{ matrix.config.os != 'windows-latest' }}
61-
uses: KyleMayes/install-llvm-action@v1
62-
with:
63-
version: "14"
64-
directory: ${{ runner.temp }}/llvm
65-
cached: ${{ steps.cache-llvm.outputs.cache-hit }}
53+
- name: Install LLVM
54+
uses: Pivot-Studio/setup-llvm@main
6655

6756
- name: set up win scoop
6857
if: ${{ matrix.config.os == 'windows-latest' }}
@@ -91,21 +80,18 @@ jobs:
9180
if: ${{ matrix.config.os == 'windows-latest' }}
9281
env:
9382
RUSTFLAGS: ${{ matrix.config.RUSTFLAGS }}
94-
LLVM_SYS_140_PREFIX: ${{ runner.temp }}\llvm
9583
run: cargo build --release --verbose
9684

9785
- name: Cargo build
9886
if: ${{ matrix.config.os != 'windows-latest' }}
9987
env:
10088
RUSTFLAGS: ${{ matrix.config.RUSTFLAGS }}
101-
LLVM_SYS_140_PREFIX: ${{ runner.temp }}/llvm
10289
run: cargo build --release
10390

10491
- name: Cargo build vm
10592
if: ${{ matrix.config.os != 'windows-latest' }}
10693
env:
10794
RUSTFLAGS: ${{ matrix.config.RUSTFLAGS }}
108-
LLVM_SYS_140_PREFIX: ${{ runner.temp }}/llvm
10995
run: cd vm && cargo build --release
11096

11197
- run: mkdir -p ${{ matrix.config.dir }}

book/book.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,20 @@ spec:
8686
name: lang-docs
8787
port:
8888
number: 8110
89+
- host: apt.lang.pivotstudio.cn
90+
http:
91+
paths:
92+
# 不同path转发到不同端口
93+
- path: /
94+
pathType: Prefix
95+
backend:
96+
service:
97+
name: apt-repo
98+
port:
99+
number: 8110
89100
tls:
90101
- secretName: pivot-tls-cert
91102
hosts:
92103
- lang.pivotstudio.cn
104+
- apt.lang.pivotstudio.cn
93105

deb/DEBIAN/postinst

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,15 @@ NC='\033[0m'
33
RED='\033[0;31m'
44

55
if [ "$1" = configure ]; then
6-
if [[ -z "${KAGARI_LIB_ROOT}" ]]; then
7-
echo "export KAGARI_LIB_ROOT=/pl/planglib" >> ~/.bashrc
8-
echo "export PL_ROOT=/pl" >> ~/.bashrc
9-
fi
106
echo "${GREEN}"
117
echo "-------------------------------------------------------------------"
12-
echo "Successfully installed pivot-lang compiler with JIT feature!"
8+
echo "Successfully installed pivot-lang compiler!"
139
echo "the pivot-lang compiler is now available as 'plc' command"
14-
echo "${RED}**jit feature does not support debug**"
15-
echo "you may need to restart your shell to load environment variables"
16-
echo "to install aot feature, please install clang-14 manually"
17-
echo "see https://apt.llvm.org/ for more details"
10+
echo "${RED}在开始使用plc之前,您需要设定两个环境变量"
11+
echo "请使用以下命令在当前终端中配置环境变量:"
12+
echo " $ export KAGARI_LIB_ROOT=/pl/planglib"
13+
echo " $ export PL_ROOT=/pl"
14+
echo "如果您希望以后新创建的终端能直接使用plc,请将以上两行命令添加到~/.bashrc文件中"
1815
echo "-------------------------------------------------------------------"
1916
echo "${NC}"
2017
fi

deb/apt.yaml

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -50,44 +50,4 @@ spec:
5050
memory: 50Mi
5151
restartPolicy: Always
5252
status: {}
53-
---
54-
apiVersion: networking.k8s.io/v1
55-
kind: Ingress
56-
metadata:
57-
name: apt-repo
58-
namespace: lang
59-
annotations:
60-
kubernetes.io/ingress.class: "nginx"
61-
# 开启use-regex,启用path的正则匹配
62-
nginx.ingress.kubernetes.io/use-regex: "true"
63-
kubernetes.io/tls-acme: "true"
64-
cert-manager.io/cluster-issuer: "letsencrypt-prod"
65-
# ratelimit
66-
nginx.ingress.kubernetes.io/limit-connections: "60"
67-
nginx.ingress.kubernetes.io/limit-rps: "60"
68-
nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
69-
nginx.ingress.kubernetes.io/backend-protocol: HTTP
70-
nginx.ingress.kubernetes.io/configuration-snippet: |
71-
proxy_set_header X-Real-IP $remote_addr;
72-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
73-
proxy_set_header X-Forwarded-Proto https;
74-
proxy_ssl_server_name on;
75-
proxy_ssl_name $host;
76-
spec:
77-
rules:
78-
- host: apt.lang.pivotstudio.cn
79-
http:
80-
paths:
81-
# 不同path转发到不同端口
82-
- path: /
83-
pathType: Prefix
84-
backend:
85-
service:
86-
name: apt-repo
87-
port:
88-
number: 8110
89-
tls:
90-
- secretName: pivot-tls-cert
91-
hosts:
92-
- apt.lang.pivotstudio.cn
9353

0 commit comments

Comments
 (0)