Skip to content

Commit

Permalink
remove useless file
Browse files Browse the repository at this point in the history
Signed-off-by: cleverhu <zhubai.hsp@xuelanyun.com>
  • Loading branch information
cleverhu committed Feb 1, 2024
1 parent 7913c07 commit 1cfd455
Show file tree
Hide file tree
Showing 6 changed files with 166 additions and 99 deletions.
6 changes: 0 additions & 6 deletions Dockerfile

This file was deleted.

162 changes: 159 additions & 3 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,162 @@
#!/bin/bash

set -ex
set -e

cargo build --release -j66
docker buildx build -t deeplythink/ninja:v0.0.1 . --push
if [ -n "$GIT_TOKEN" ]; then
if [ -d "patches" ]; then
rm -rf patches
fi
git clone https://gngpp:$GIT_TOKEN@github.com/gngpp/ninja-patches patches

if [ $(ls patches/*.patch 2>/dev/null | wc -l) -gt 0 ]; then
for patch in patches/*.patch; do
git apply --whitespace=nowarn "$patch"
done
fi
fi

root=$(pwd)
: ${tag=latest}
: ${rmi=false}
: ${os=linux}
[ ! -d uploads ] && mkdir uploads

# Separate arrays for target architectures and Docker images
target_architectures=("x86_64-unknown-linux-musl" "aarch64-unknown-linux-musl" "armv7-unknown-linux-musleabi" "armv7-unknown-linux-musleabihf" "arm-unknown-linux-musleabi" "arm-unknown-linux-musleabihf" "armv5te-unknown-linux-musleabi" "i686-unknown-linux-gnu" "i586-unknown-linux-gnu" "x86_64-pc-windows-msvc")
docker_images=("ghcr.io/gngpp/rust-musl-cross:x86_64-musl" "ghcr.io/gngpp/rust-musl-cross:aarch64-musl" "ghcr.io/gngpp/rust-musl-cross:armv7-musleabi" "ghcr.io/gngpp/rust-musl-cross:armv7-musleabihf" "ghcr.io/gngpp/rust-musl-cross:arm-musleabi" "ghcr.io/gngpp/rust-musl-cross:arm-musleabihf" "ghcr.io/gngpp/rust-musl-cross:armv5te-musleabi" "ghcr.io/gngpp/rust-musl-cross:i686-musl" "ghcr.io/gngpp/rust-musl-cross:i586-musl" "ghcr.io/gngpp/cargo-xwin:latest")

get_docker_image() {
local target_arch="$1"
local index
for ((index = 0; index < ${#target_architectures[@]}; ++index)); do
if [ "${target_architectures[index]}" == "$target_arch" ]; then
echo "${docker_images[index]}"
return 0
fi
done

echo "Architecture not found"
return 1
}

rmi_docker_image() {
echo "Removing $1"
docker rmi $1
}

build_macos_target() {
cargo build --release --target $1 --features mimalloc
sudo chmod -R 777 target
cd target/$1/release
tar czvf ninja-$tag-$1.tar.gz ninja
shasum -a 256 ninja-$tag-$1.tar.gz >ninja-$tag-$1.tar.gz.sha256
mv ninja-$tag-$1.tar.gz $root/uploads/
mv ninja-$tag-$1.tar.gz.sha256 $root/uploads/
cd -
}

build_linux_target() {
features=""
if [ "$1" = "armv5te-unknown-linux-musleabi" ] || [ "$1" = "arm-unknown-linux-musleabi" ] || [ "$1" = "arm-unknown-linux-musleabihf" ]; then
features="--features rpmalloc"
else
if [ "$1" = "i686-unknown-linux-gnu" ] || [ "$1" = "i586-unknown-linux-gnu" ]; then
features=""
else
features="--features mimalloc"
fi
fi

docker_image=$(get_docker_image "$1")

docker run --rm -t --user=$UID:$(id -g $USER) \
-v $(pwd):/home/rust/src \
-v $HOME/.cargo/registry:/root/.cargo/registry \
-v $HOME/.cargo/git:/root/.cargo/git \
-e "FEATURES=$features" \
-e "TARGET=$1" \
$docker_image /bin/bash -c "cargo build --release --target \$TARGET \$FEATURES"

sudo chmod -R 777 target
if [ "$1" != "i686-unknown-linux-gnu" ] && [ "$1" != "i586-unknown-linux-gnu" ]; then
upx --best --lzma target/$1/release/ninja
fi
cd target/$1/release
tar czvf ninja-$tag-$1.tar.gz ninja
shasum -a 256 ninja-$tag-$1.tar.gz >ninja-$tag-$1.tar.gz.sha256
mv ninja-$tag-$1.tar.gz $root/uploads/
mv ninja-$tag-$1.tar.gz.sha256 $root/uploads/
cd -
}

build_windows_target() {
docker_image=$(get_docker_image "$1")

docker run --rm -t \
-v $(pwd):/home/rust/src \
-v $HOME/.cargo/registry:/usr/local/cargo/registry \
-v $HOME/.cargo/git:/usr/local/cargo/git \
$docker_image cargo xwin build --release --target $1

sudo chmod -R 777 target
upx --best --lzma target/$1/release/ninja.exe
cd target/$1/release
tar czvf ninja-$tag-$1.tar.gz ninja.exe
shasum -a 256 ninja-$tag-$1.tar.gz >ninja-$tag-$1.tar.gz.sha256
mv ninja-$tag-$1.tar.gz $root/uploads/
mv ninja-$tag-$1.tar.gz.sha256 $root/uploads/
cd -
}

if [ "$os" = "windows" ]; then
target_list=(x86_64-pc-windows-msvc)
for target in "${target_list[@]}"; do
echo "Building $target"

docker_image=$(get_docker_image "$target")

build_windows_target "$target"

if [ "$rmi" = "true" ]; then
rmi_docker_image "$docker_image"
fi
done
fi

if [ "$os" = "linux" ]; then
target_list=(x86_64-unknown-linux-musl aarch64-unknown-linux-musl armv7-unknown-linux-musleabi armv7-unknown-linux-musleabihf armv5te-unknown-linux-musleabi arm-unknown-linux-musleabi arm-unknown-linux-musleabihf i686-unknown-linux-gnu i586-unknown-linux-gnu)

for target in "${target_list[@]}"; do
echo "Building $target"

docker_image=$(get_docker_image "$target")

if [ "$target" = "x86_64-pc-windows-msvc" ]; then
build_windows_target "$target"
else
build_linux_target "$target"
fi

if [ "$rmi" = "true" ]; then
rmi_docker_image "$docker_image"
fi
done
fi

if [ "$os" = "macos" ]; then
if ! which upx &>/dev/null; then
brew install upx
fi
rustup target add x86_64-apple-darwin aarch64-apple-darwin
target_list=(x86_64-apple-darwin aarch64-apple-darwin)
for target in "${target_list[@]}"; do
echo "Building $target"
build_macos_target "$target"
done
fi

generate_directory_tree() {
find "$1" -print | sed -e 's;[^/]*/;|____;g;s;____|; |;g'
}

generate_directory_tree "uploads"
1 change: 1 addition & 0 deletions crates/openai/frontend/har/error.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<!DOCTYPE html><html lang="en"><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Error</title><style>body{font-family:Arial,sans-serif;margin:0;padding:20px;background-color:#f7f7f7}.container{max-width:400px;margin:0 auto;background-color:#fff;padding:20px;border-radius:5px;box-shadow:0 2px 4px rgba(0,0,0,.1)}.error-message{color:#d9534f;font-size:18px;font-weight:700;margin-bottom:10px}.back-btn{display:inline-block;margin-top:10px;padding:8px 20px;background-color:#007bff;color:#fff;border:none;border-radius:8px;font-size:16px;cursor:pointer}</style></head><body><div class="container"><div class="error-message">{{.title}}</div><p>{{.error}}</p><button class="back-btn" onclick="goBack()">Go Back</button></div><script>function goBack(){window.history.back()}</script></body></html>
84 changes: 0 additions & 84 deletions crates/openai/frontend/har/gpts.html

This file was deleted.

4 changes: 2 additions & 2 deletions crates/openai/src/arkose/funcaptcha/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ pub async fn start_challenge(ctx: &ArkoseSolverContext) -> FunResult<Session> {

let referer = format!(
"{}/fc/assets/ec-game-core/game-core/1.18.0/standard/index.html?session={}",
"https://client-api.arkoselabs.com",
ctx.typed.origin_url(),
value.replace("|", "&")
);
let mut headers = header::HeaderMap::new();
Expand Down Expand Up @@ -119,7 +119,7 @@ impl Session {
.client
.get(format!(
"{}/fc/gc/?token={}",
"https://client-api.arkoselabs.com", self.session_token
self.origin, self.session_token
))
.send()
.await?
Expand Down
8 changes: 4 additions & 4 deletions crates/openai/src/arkose/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,9 @@ impl Type {
/// Get the origin url
pub fn origin_url(&self) -> &'static str {
match self {
Type::Auth => "https://oai-proxy.cloud.sealos.io/https://tcr9i.openai.com",
Type::GPT3 | Type::GPT4 => "https://oai-proxy.cloud.sealos.io/https://tcr9i.chat.openai.com",
Type::Platform | Type::SignUp => "https://oai-proxy.cloud.sealos.io/https://openai-api.arkoselabs.com",
Type::Auth => "https://tcr9i.openai.com",
Type::GPT3 | Type::GPT4 => "https://tcr9i.chat.openai.com",
Type::Platform | Type::SignUp => "https://openai-api.arkoselabs.com",
}
}
}
Expand Down Expand Up @@ -209,7 +209,7 @@ impl ArkoseToken {
serde_json::json!({
"token": self.token,
"challenge_url":"",
"challenge_url_cdn":"https://client-api.arkoselabs.com/cdn/fc/assets/ec-game-core/bootstrap/1.18.0/standard/game_core_bootstrap.js",
"challenge_url_cdn":"/cdn/fc/assets/ec-game-core/bootstrap/1.18.0/standard/game_core_bootstrap.js",
"challenge_url_cdn_sri":null,
"noscript":"Disable",
"inject_script_integrity":null,
Expand Down

0 comments on commit 1cfd455

Please sign in to comment.