Compare commits
6 Commits
45669437c0
...
v0.1.4
Author | SHA1 | Date | |
---|---|---|---|
2838e494d6
|
|||
5838adf5a6
|
|||
f52249c292
|
|||
aa70183d75
|
|||
4ad1d3edf6
|
|||
55bf725491
|
@@ -45,8 +45,7 @@
|
|||||||
"Bash(git add:*)",
|
"Bash(git add:*)",
|
||||||
"Bash(git commit:*)",
|
"Bash(git commit:*)",
|
||||||
"Bash(git push:*)",
|
"Bash(git push:*)",
|
||||||
"Bash(git tag:*)",
|
"Bash(git tag:*)"
|
||||||
"Bash(../bin/ailog:*)"
|
|
||||||
],
|
],
|
||||||
"deny": []
|
"deny": []
|
||||||
}
|
}
|
||||||
|
51
.github/workflows/build-binary.yml
vendored
Normal file
51
.github/workflows/build-binary.yml
vendored
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
name: Build Binary
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_dispatch: # Manual trigger
|
||||||
|
push:
|
||||||
|
branches: [ main ]
|
||||||
|
paths:
|
||||||
|
- 'src/**'
|
||||||
|
- 'Cargo.toml'
|
||||||
|
- 'Cargo.lock'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Setup Rust
|
||||||
|
uses: actions-rs/toolchain@v1
|
||||||
|
with:
|
||||||
|
toolchain: stable
|
||||||
|
override: true
|
||||||
|
|
||||||
|
- name: Cache cargo registry
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: ~/.cargo/registry
|
||||||
|
key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
|
||||||
|
|
||||||
|
- name: Cache cargo index
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: ~/.cargo/git
|
||||||
|
key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
|
||||||
|
|
||||||
|
- name: Cache target directory
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: target
|
||||||
|
key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
|
||||||
|
|
||||||
|
- name: Build binary
|
||||||
|
run: cargo build --release
|
||||||
|
|
||||||
|
- name: Upload binary
|
||||||
|
uses: actions/upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: ailog-linux
|
||||||
|
path: target/release/ailog
|
||||||
|
retention-days: 30
|
65
.github/workflows/cloudflare-pages.yml
vendored
65
.github/workflows/cloudflare-pages.yml
vendored
@@ -34,67 +34,22 @@ jobs:
|
|||||||
|
|
||||||
- name: Copy OAuth build to static
|
- name: Copy OAuth build to static
|
||||||
run: |
|
run: |
|
||||||
# Remove old assets (following run.zsh pattern)
|
mkdir -p my-blog/static/assets
|
||||||
rm -rf my-blog/static/assets
|
cp -r oauth/dist/assets/* my-blog/static/assets/
|
||||||
# Copy all dist files to static
|
cp oauth/dist/index.html my-blog/static/oauth/index.html || true
|
||||||
cp -rf oauth/dist/* my-blog/static/
|
|
||||||
# Copy index.html to oauth-assets.html template
|
|
||||||
cp oauth/dist/index.html my-blog/templates/oauth-assets.html
|
|
||||||
|
|
||||||
- name: Cache ailog binary
|
- name: Setup Rust
|
||||||
uses: actions/cache@v4
|
uses: actions-rs/toolchain@v1
|
||||||
with:
|
with:
|
||||||
path: ./bin
|
toolchain: stable
|
||||||
key: ailog-bin-${{ runner.os }}
|
|
||||||
restore-keys: |
|
- name: Build ailog
|
||||||
ailog-bin-${{ runner.os }}
|
run: cargo build --release
|
||||||
|
|
||||||
- name: Setup ailog binary
|
|
||||||
run: |
|
|
||||||
# Get expected version from Cargo.toml
|
|
||||||
EXPECTED_VERSION=$(grep '^version' Cargo.toml | cut -d'"' -f2)
|
|
||||||
echo "Expected version from Cargo.toml: $EXPECTED_VERSION"
|
|
||||||
|
|
||||||
# Check current binary version if exists
|
|
||||||
if [ -f "./bin/ailog" ]; then
|
|
||||||
CURRENT_VERSION=$(./bin/ailog --version 2>/dev/null || echo "unknown")
|
|
||||||
echo "Current binary version: $CURRENT_VERSION"
|
|
||||||
else
|
|
||||||
CURRENT_VERSION="none"
|
|
||||||
echo "No binary found"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check OS
|
|
||||||
OS="${{ runner.os }}"
|
|
||||||
echo "Runner OS: $OS"
|
|
||||||
|
|
||||||
# Use pre-packaged binary if version matches or extract from tar.gz
|
|
||||||
if [ "$CURRENT_VERSION" = "$EXPECTED_VERSION" ]; then
|
|
||||||
echo "Binary is up to date"
|
|
||||||
chmod +x ./bin/ailog
|
|
||||||
elif [ "$OS" = "Linux" ] && [ -f "./bin/ailog-linux-x86_64.tar.gz" ]; then
|
|
||||||
echo "Extracting ailog from pre-packaged tar.gz..."
|
|
||||||
cd bin
|
|
||||||
tar -xzf ailog-linux-x86_64.tar.gz
|
|
||||||
chmod +x ailog
|
|
||||||
cd ..
|
|
||||||
|
|
||||||
# Verify extracted version
|
|
||||||
EXTRACTED_VERSION=$(./bin/ailog --version 2>/dev/null || echo "unknown")
|
|
||||||
echo "Extracted binary version: $EXTRACTED_VERSION"
|
|
||||||
|
|
||||||
if [ "$EXTRACTED_VERSION" != "$EXPECTED_VERSION" ]; then
|
|
||||||
echo "Warning: Binary version mismatch. Expected $EXPECTED_VERSION but got $EXTRACTED_VERSION"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo "Error: No suitable binary found for OS: $OS"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Build site with ailog
|
- name: Build site with ailog
|
||||||
run: |
|
run: |
|
||||||
cd my-blog
|
cd my-blog
|
||||||
../bin/ailog build
|
../target/release/ailog build
|
||||||
|
|
||||||
- name: List public directory
|
- name: List public directory
|
||||||
run: |
|
run: |
|
||||||
|
92
.github/workflows/disabled/gh-pages-fast.yml
vendored
92
.github/workflows/disabled/gh-pages-fast.yml
vendored
@@ -1,92 +0,0 @@
|
|||||||
name: github pages (fast)
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- main
|
|
||||||
paths-ignore:
|
|
||||||
- 'src/**'
|
|
||||||
- 'Cargo.toml'
|
|
||||||
- 'Cargo.lock'
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build-deploy:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
permissions:
|
|
||||||
contents: write
|
|
||||||
pages: write
|
|
||||||
id-token: write
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Cache ailog binary
|
|
||||||
uses: actions/cache@v4
|
|
||||||
with:
|
|
||||||
path: ./bin
|
|
||||||
key: ailog-bin-${{ runner.os }}
|
|
||||||
restore-keys: |
|
|
||||||
ailog-bin-${{ runner.os }}
|
|
||||||
|
|
||||||
- name: Setup ailog binary
|
|
||||||
run: |
|
|
||||||
# Get expected version from Cargo.toml
|
|
||||||
EXPECTED_VERSION=$(grep '^version' Cargo.toml | cut -d'"' -f2)
|
|
||||||
echo "Expected version from Cargo.toml: $EXPECTED_VERSION"
|
|
||||||
|
|
||||||
# Check current binary version if exists
|
|
||||||
if [ -f "./bin/ailog" ]; then
|
|
||||||
CURRENT_VERSION=$(./bin/ailog --version 2>/dev/null || echo "unknown")
|
|
||||||
echo "Current binary version: $CURRENT_VERSION"
|
|
||||||
else
|
|
||||||
CURRENT_VERSION="none"
|
|
||||||
echo "No binary found"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check OS
|
|
||||||
OS="${{ runner.os }}"
|
|
||||||
echo "Runner OS: $OS"
|
|
||||||
|
|
||||||
# Use pre-packaged binary if version matches or extract from tar.gz
|
|
||||||
if [ "$CURRENT_VERSION" = "$EXPECTED_VERSION" ]; then
|
|
||||||
echo "Binary is up to date"
|
|
||||||
chmod +x ./bin/ailog
|
|
||||||
elif [ "$OS" = "Linux" ] && [ -f "./bin/ailog-linux-x86_64.tar.gz" ]; then
|
|
||||||
echo "Extracting ailog from pre-packaged tar.gz..."
|
|
||||||
cd bin
|
|
||||||
tar -xzf ailog-linux-x86_64.tar.gz
|
|
||||||
chmod +x ailog
|
|
||||||
cd ..
|
|
||||||
|
|
||||||
# Verify extracted version
|
|
||||||
EXTRACTED_VERSION=$(./bin/ailog --version 2>/dev/null || echo "unknown")
|
|
||||||
echo "Extracted binary version: $EXTRACTED_VERSION"
|
|
||||||
|
|
||||||
if [ "$EXTRACTED_VERSION" != "$EXPECTED_VERSION" ]; then
|
|
||||||
echo "Warning: Binary version mismatch. Expected $EXPECTED_VERSION but got $EXTRACTED_VERSION"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo "Error: No suitable binary found for OS: $OS"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Setup Hugo
|
|
||||||
uses: peaceiris/actions-hugo@v3
|
|
||||||
with:
|
|
||||||
hugo-version: "0.139.2"
|
|
||||||
extended: true
|
|
||||||
|
|
||||||
- name: Build with ailog
|
|
||||||
env:
|
|
||||||
TZ: "Asia/Tokyo"
|
|
||||||
run: |
|
|
||||||
# Use pre-built ailog binary instead of cargo build
|
|
||||||
cd my-blog
|
|
||||||
../bin/ailog build
|
|
||||||
touch ./public/.nojekyll
|
|
||||||
|
|
||||||
- name: Deploy
|
|
||||||
uses: peaceiris/actions-gh-pages@v3
|
|
||||||
with:
|
|
||||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
publish_dir: ./my-blog/public
|
|
||||||
publish_branch: gh-pages
|
|
77
.github/workflows/gh-pages-fast.yml
vendored
Normal file
77
.github/workflows/gh-pages-fast.yml
vendored
Normal file
@@ -0,0 +1,77 @@
|
|||||||
|
name: github pages (fast)
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
paths-ignore:
|
||||||
|
- 'src/**'
|
||||||
|
- 'Cargo.toml'
|
||||||
|
- 'Cargo.lock'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build-deploy:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Cache ailog binary
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: ./bin
|
||||||
|
key: ailog-bin-${{ runner.os }}
|
||||||
|
restore-keys: |
|
||||||
|
ailog-bin-${{ runner.os }}
|
||||||
|
|
||||||
|
- name: Check and update ailog binary
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
run: |
|
||||||
|
# Get latest release version
|
||||||
|
LATEST_VERSION=$(curl -s -H "Authorization: Bearer $GITHUB_TOKEN" \
|
||||||
|
https://api.github.com/repos/${{ github.repository }}/releases/latest | jq -r .tag_name)
|
||||||
|
echo "Latest version: $LATEST_VERSION"
|
||||||
|
|
||||||
|
# Check current binary version if exists
|
||||||
|
mkdir -p ./bin
|
||||||
|
if [ -f "./bin/ailog" ]; then
|
||||||
|
CURRENT_VERSION=$(./bin/ailog --version 2>/dev/null || echo "unknown")
|
||||||
|
echo "Current version: $CURRENT_VERSION"
|
||||||
|
else
|
||||||
|
CURRENT_VERSION="none"
|
||||||
|
echo "No binary found"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Download if version is different or binary doesn't exist
|
||||||
|
if [ "$CURRENT_VERSION" != "${LATEST_VERSION#v}" ]; then
|
||||||
|
echo "Downloading ailog $LATEST_VERSION..."
|
||||||
|
curl -sL -H "Authorization: Bearer $GITHUB_TOKEN" \
|
||||||
|
https://github.com/${{ github.repository }}/releases/download/$LATEST_VERSION/ailog-linux-x86_64.tar.gz | tar -xzf -
|
||||||
|
mv ailog ./bin/ailog
|
||||||
|
chmod +x ./bin/ailog
|
||||||
|
echo "Updated to version: $(./bin/ailog --version 2>/dev/null)"
|
||||||
|
else
|
||||||
|
echo "Binary is up to date"
|
||||||
|
chmod +x ./bin/ailog
|
||||||
|
fi
|
||||||
|
|
||||||
|
- name: Setup Hugo
|
||||||
|
uses: peaceiris/actions-hugo@v3
|
||||||
|
with:
|
||||||
|
hugo-version: "0.139.2"
|
||||||
|
extended: true
|
||||||
|
|
||||||
|
- name: Build with ailog
|
||||||
|
env:
|
||||||
|
TZ: "Asia/Tokyo"
|
||||||
|
run: |
|
||||||
|
# Use pre-built ailog binary instead of cargo build
|
||||||
|
./bin/ailog build --output ./public
|
||||||
|
touch ./public/.nojekyll
|
||||||
|
|
||||||
|
- name: Deploy
|
||||||
|
uses: peaceiris/actions-gh-pages@v3
|
||||||
|
with:
|
||||||
|
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
publish_dir: ./public
|
||||||
|
publish_branch: gh-pages
|
1
.gitignore
vendored
1
.gitignore
vendored
@@ -11,4 +11,3 @@ dist
|
|||||||
node_modules
|
node_modules
|
||||||
package-lock.json
|
package-lock.json
|
||||||
my-blog/static/assets/comment-atproto-*
|
my-blog/static/assets/comment-atproto-*
|
||||||
bin/ailog
|
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "ailog"
|
name = "ailog"
|
||||||
version = "0.1.4"
|
version = "0.1.3"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
authors = ["syui"]
|
authors = ["syui"]
|
||||||
description = "A static blog generator with AI features"
|
description = "A static blog generator with AI features"
|
||||||
|
68
action.yml
68
action.yml
@@ -55,26 +55,49 @@ runs:
|
|||||||
restore-keys: |
|
restore-keys: |
|
||||||
ailog-bin-${{ runner.os }}
|
ailog-bin-${{ runner.os }}
|
||||||
|
|
||||||
- name: Setup ailog binary
|
- name: Check and update ailog binary
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
# Check if pre-built binary exists
|
# Get latest release version (for Gitea, adjust API endpoint if needed)
|
||||||
if [ -f "./bin/ailog-linux-x86_64" ]; then
|
if command -v curl >/dev/null 2>&1; then
|
||||||
echo "Using pre-built binary from repository"
|
LATEST_VERSION=$(curl -s https://api.github.com/repos/syui/ailog/releases/latest | jq -r .tag_name 2>/dev/null || echo "v0.1.1")
|
||||||
chmod +x ./bin/ailog-linux-x86_64
|
|
||||||
CURRENT_VERSION=$(./bin/ailog-linux-x86_64 --version 2>/dev/null || echo "unknown")
|
|
||||||
echo "Binary version: $CURRENT_VERSION"
|
|
||||||
else
|
else
|
||||||
echo "No pre-built binary found, trying to build from source..."
|
LATEST_VERSION="v0.1.1" # fallback version
|
||||||
if command -v cargo >/dev/null 2>&1; then
|
fi
|
||||||
cargo build --release
|
echo "Target version: $LATEST_VERSION"
|
||||||
mkdir -p ./bin
|
|
||||||
cp ./target/release/ailog ./bin/ailog-linux-x86_64
|
# Check current binary version if exists
|
||||||
echo "Built from source: $(./bin/ailog-linux-x86_64 --version 2>/dev/null)"
|
mkdir -p ./bin
|
||||||
|
if [ -f "./bin/ailog" ]; then
|
||||||
|
CURRENT_VERSION=$(./bin/ailog --version 2>/dev/null || echo "unknown")
|
||||||
|
echo "Current version: $CURRENT_VERSION"
|
||||||
|
else
|
||||||
|
CURRENT_VERSION="none"
|
||||||
|
echo "No binary found"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Download if version is different or binary doesn't exist
|
||||||
|
if [ "$CURRENT_VERSION" != "${LATEST_VERSION#v}" ]; then
|
||||||
|
echo "Downloading ailog $LATEST_VERSION..."
|
||||||
|
# Try GitHub first, then fallback to local build
|
||||||
|
if curl -sL https://github.com/syui/ailog/releases/download/$LATEST_VERSION/ailog-linux-x86_64.tar.gz | tar -xzf - 2>/dev/null; then
|
||||||
|
mv ailog ./bin/ailog
|
||||||
|
chmod +x ./bin/ailog
|
||||||
|
echo "Downloaded binary: $(./bin/ailog --version 2>/dev/null)"
|
||||||
else
|
else
|
||||||
echo "Error: No binary found and cargo not available"
|
echo "Download failed, building from source..."
|
||||||
exit 1
|
if command -v cargo >/dev/null 2>&1; then
|
||||||
|
cargo build --release
|
||||||
|
cp ./target/release/ailog ./bin/ailog
|
||||||
|
echo "Built from source: $(./bin/ailog --version 2>/dev/null)"
|
||||||
|
else
|
||||||
|
echo "Error: Neither download nor cargo build available"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
echo "Binary is up to date"
|
||||||
|
chmod +x ./bin/ailog
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Setup Node.js for OAuth app
|
- name: Setup Node.js for OAuth app
|
||||||
@@ -100,15 +123,12 @@ runs:
|
|||||||
run: |
|
run: |
|
||||||
start_time=$(date +%s)
|
start_time=$(date +%s)
|
||||||
|
|
||||||
# Change to blog directory and run build
|
./bin/ailog build \
|
||||||
# Note: ailog build only takes a path argument, not options
|
--content ${{ inputs.content-dir }} \
|
||||||
if [ -d "my-blog" ]; then
|
--output ${{ inputs.output-dir }} \
|
||||||
cd my-blog
|
--templates ${{ inputs.template-dir }} \
|
||||||
../bin/ailog-linux-x86_64 build
|
--static ${{ inputs.static-dir }} \
|
||||||
else
|
--config ${{ inputs.config-file }}
|
||||||
# If no my-blog directory, use current directory
|
|
||||||
./bin/ailog-linux-x86_64 build .
|
|
||||||
fi
|
|
||||||
|
|
||||||
end_time=$(date +%s)
|
end_time=$(date +%s)
|
||||||
build_time=$((end_time - start_time))
|
build_time=$((end_time - start_time))
|
||||||
|
Binary file not shown.
@@ -1,5 +1,8 @@
|
|||||||
# Ask-AI機能をOllamaにプロキシ
|
# AI機能をai.gpt MCP serverにリダイレクト
|
||||||
/api/ask https://ollama.syui.ai/api/generate 200
|
/api/ask https://ai-gpt-mcp.syui.ai/ask 200
|
||||||
|
|
||||||
|
# Ollama API proxy (Cloudflare Workers)
|
||||||
|
/api/ollama-proxy https://ollama-proxy.YOUR-SUBDOMAIN.workers.dev/:splat 200
|
||||||
|
|
||||||
# OAuth routes
|
# OAuth routes
|
||||||
/oauth/* /oauth/index.html 200
|
/oauth/* /oauth/index.html 200
|
||||||
|
@@ -15,6 +15,7 @@
|
|||||||
<link rel="stylesheet" href="/pkg/icomoon/style.css">
|
<link rel="stylesheet" href="/pkg/icomoon/style.css">
|
||||||
<link rel="stylesheet" href="/pkg/font-awesome/css/all.min.css">
|
<link rel="stylesheet" href="/pkg/font-awesome/css/all.min.css">
|
||||||
|
|
||||||
|
{% include "oauth-assets.html" %}
|
||||||
{% block head %}{% endblock %}
|
{% block head %}{% endblock %}
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
@@ -91,7 +92,5 @@
|
|||||||
|
|
||||||
<script src="/js/ask-ai.js"></script>
|
<script src="/js/ask-ai.js"></script>
|
||||||
<script src="/js/theme.js"></script>
|
<script src="/js/theme.js"></script>
|
||||||
|
|
||||||
{% include "oauth-assets.html" %}
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
Reference in New Issue
Block a user