Skip to content

Commit 8e721d8

Browse files
Liam-WirthLiam-Wirth
committed
yeaaaahhh
1 parent 6387c02 commit 8e721d8

File tree

2 files changed

+77
-69
lines changed

2 files changed

+77
-69
lines changed

‎.github/workflows/pages.yml

+74-67
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ jobs:
8787
- uses: actions-rs/cargo@v1
8888
with:
8989
command: clippy
90-
args: -- -D warnings
90+
# args: -- -D warnings
91+
args: --
9192

9293
trunk:
9394
name: trunk
@@ -105,69 +106,75 @@ jobs:
105106
- name: Build
106107
run: ./trunk build
107108

108-
build:
109-
runs-on: ${{ matrix.os }}
110-
strategy:
111-
fail-fast: false
112-
matrix:
113-
include:
114-
- os: macos-latest
115-
TARGET: aarch64-apple-darwin
116-
117-
- os: ubuntu-latest
118-
TARGET: aarch64-unknown-linux-gnu
119-
120-
- os: ubuntu-latest
121-
TARGET: armv7-unknown-linux-gnueabihf
122-
123-
- os: ubuntu-latest
124-
TARGET: x86_64-unknown-linux-gnu
125-
126-
- os: windows-latest
127-
TARGET: x86_64-pc-windows-msvc
128-
EXTENSION: .exe
129-
130-
steps:
131-
- name: Building ${{ matrix.TARGET }}
132-
run: echo "${{ matrix.TARGET }}"
133-
134-
- uses: actions/checkout@master
135-
- name: Install build dependencies - Rustup
136-
run: |
137-
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain stable --profile default --target ${{ matrix.TARGET }} -y
138-
echo "$HOME/.cargo/bin" >> $GITHUB_PATH
139-
140-
# For linux, it's necessary to use cross from the git repository to avoid glibc problems
141-
# Ref: https://github.com/cross-rs/cross/issues/1510
142-
- name: Install cross for linux
143-
if: contains(matrix.TARGET, 'linux')
144-
run: |
145-
cargo install cross --git https://github.com/cross-rs/cross --rev 1b8cf50d20180c1a394099e608141480f934b7f7
146-
147-
- name: Install cross for mac and windows
148-
if: ${{ !contains(matrix.TARGET, 'linux') }}
149-
run: |
150-
cargo install cross
151-
152-
- name: Build
153-
run: |
154-
cross build --verbose --release --target=${{ matrix.TARGET }}
155-
156-
- name: Rename
157-
run: cp target/${{ matrix.TARGET }}/release/eframe_template${{ matrix.EXTENSION }} eframe_template-${{ matrix.TARGET }}${{ matrix.EXTENSION }}
158-
159-
- uses: actions/upload-artifact@master
160-
with:
161-
name: eframe_template-${{ matrix.TARGET }}${{ matrix.EXTENSION }}
162-
path: eframe_template-${{ matrix.TARGET }}${{ matrix.EXTENSION }}
163-
164-
- uses: svenstaro/upload-release-action@v2
165-
name: Upload binaries to release
166-
if: ${{ github.event_name == 'push' }}
167-
with:
168-
repo_token: ${{ secrets.GITHUB_TOKEN }}
169-
file: eframe_template-${{ matrix.TARGET }}${{ matrix.EXTENSION }}
170-
asset_name: eframe_template-${{ matrix.TARGET }}${{ matrix.EXTENSION }}
171-
tag: ${{ github.ref }}
172-
prerelease: ${{ !startsWith(github.ref, 'refs/tags/') }}
173-
overwrite: true
109+
- name: Deploy to GitHub Pages
110+
uses: peaceiris/actions-gh-pages@v3
111+
with:
112+
github_token: ${{ secrets.GITHUB_TOKEN }}
113+
publish_branch: gh-pages
114+
publish_dir: ./dist # Or wherever your `trunk` build artifacts are located
115+
# build:
116+
# runs-on: ${{ matrix.os }}
117+
# strategy:
118+
# fail-fast: false
119+
# matrix:
120+
# include:
121+
# - os: macos-latest
122+
# TARGET: aarch64-apple-darwin
123+
124+
# - os: ubuntu-latest
125+
# TARGET: aarch64-unknown-linux-gnu
126+
127+
# - os: ubuntu-latest
128+
# TARGET: armv7-unknown-linux-gnueabihf
129+
130+
# - os: ubuntu-latest
131+
# TARGET: x86_64-unknown-linux-gnu
132+
133+
# - os: windows-latest
134+
# TARGET: x86_64-pc-windows-msvc
135+
# EXTENSION: .exe
136+
137+
# steps:
138+
# - name: Building ${{ matrix.TARGET }}
139+
# run: echo "${{ matrix.TARGET }}"
140+
141+
# - uses: actions/checkout@master
142+
# - name: Install build dependencies - Rustup
143+
# run: |
144+
# curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain stable --profile default --target ${{ matrix.TARGET }} -y
145+
# echo "$HOME/.cargo/bin" >> $GITHUB_PATH
146+
147+
# # For linux, it's necessary to use cross from the git repository to avoid glibc problems
148+
# # Ref: https://github.com/cross-rs/cross/issues/1510
149+
# - name: Install cross for linux
150+
# if: contains(matrix.TARGET, 'linux')
151+
# run: |
152+
# cargo install cross --git https://github.com/cross-rs/cross --rev 1b8cf50d20180c1a394099e608141480f934b7f7
153+
154+
# - name: Install cross for mac and windows
155+
# if: ${{ !contains(matrix.TARGET, 'linux') }}
156+
# run: |
157+
# cargo install cross
158+
159+
# - name: Build
160+
# run: |
161+
# cross build --verbose --release --target=${{ matrix.TARGET }}
162+
163+
# - name: Rename
164+
# run: cp target/${{ matrix.TARGET }}/release/eframe_template${{ matrix.EXTENSION }} eframe_template-${{ matrix.TARGET }}${{ matrix.EXTENSION }}
165+
166+
# - uses: actions/upload-artifact@master
167+
# with:
168+
# name: eframe_template-${{ matrix.TARGET }}${{ matrix.EXTENSION }}
169+
# path: eframe_template-${{ matrix.TARGET }}${{ matrix.EXTENSION }}
170+
171+
# - uses: svenstaro/upload-release-action@v2
172+
# name: Upload binaries to release
173+
# if: ${{ github.event_name == 'push' }}
174+
# with:
175+
# repo_token: ${{ secrets.GITHUB_TOKEN }}
176+
# file: eframe_template-${{ matrix.TARGET }}${{ matrix.EXTENSION }}
177+
# asset_name: eframe_template-${{ matrix.TARGET }}${{ matrix.EXTENSION }}
178+
# tag: ${{ github.ref }}
179+
# prerelease: ${{ !startsWith(github.ref, 'refs/tags/') }}
180+
# overwrite: true

‎.github/workflows/rust.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ jobs:
8787
- uses: actions-rs/cargo@v1
8888
with:
8989
command: clippy
90-
args: -- -D warnings
90+
# args: -- -D warnings
91+
args: -- -D
9192

9293
trunk:
9394
name: trunk
@@ -133,7 +134,7 @@ jobs:
133134

134135
# - uses: actions/checkout@master
135136
# - name: Install build dependencies - Rustup
136-
run: |
137+
# run: |
137138
# curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain stable --profile default --target ${{ matrix.TARGET }} -y
138139
# echo "$HOME/.cargo/bin" >> $GITHUB_PATH
139140

0 commit comments

Comments
 (0)