Skip to content

Commit abda879

Browse files
committed
style tweaks
add envs add tab hotkey other fix
1 parent f81f4e8 commit abda879

File tree

12 files changed

+406
-278
lines changed

12 files changed

+406
-278
lines changed

.github/workflows/build_linux.yml

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
11
name: Linux CI
22
on:
33
workflow_dispatch:
4-
push:
5-
branches:
6-
- "main"
7-
paths-ignore:
8-
- "docs/**"
9-
- "**/.gitignore"
10-
- "**/.dockerignore"
11-
- LICENSE
12-
- "**/*.md"
13-
pull_request:
14-
branches:
15-
- "main"
16-
paths-ignore:
17-
- "docs/**"
18-
- "**/.gitignore"
19-
- "**/.dockerignore"
20-
- LICENSE
21-
- "**/*.md"
4+
# push:
5+
# branches:
6+
# - "dev"
7+
# paths-ignore:
8+
# - "docs/**"
9+
# - ".gitignore"
10+
# - LICENSE
11+
# - "*.md"
12+
# pull_request:
13+
# branches:
14+
# - "dev"
15+
# paths-ignore:
16+
# - "docs/**"
17+
# - ".gitignore"
18+
# - LICENSE
19+
# - "*.md"
2220

2321
jobs:
2422
build:

.github/workflows/build_release.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
name: CI Passing
22
on:
3-
push:
4-
tags:
5-
- v*
3+
workflow_dispatch:
4+
# push:
5+
# branches:
6+
# - "dev"
7+
# paths-ignore:
8+
# - "docs/**"
9+
# - "*.md"
10+
# - LICENSE
11+
# - .gitignore
612

713
env:
814
CARGO_TERM_COLOR: always
@@ -23,7 +29,7 @@ jobs:
2329
os: ubuntu-latest
2430
target: arm64
2531
# x86_64-windows-gnu
26-
- arch: x86_64-windows-gnu
32+
- arch: ucrt-x86_64-windows-gnu
2733
os: windows-latest
2834
target: amd64
2935

@@ -200,7 +206,7 @@ jobs:
200206
201207
- name: Get latest tag name
202208
id: tag
203-
run: echo "TAG_NAME=$(git describe --tags --abbrev=0)" >> $GITHUB_OUTPUT
209+
run: echo "TAG_NAME=v$(date '+%Y-%m-%d-%H%M%S')" >> $GITHUB_OUTPUT
204210

205211
- name: Set prerelease variable
206212
if: startsWith(github.ref, 'refs/tags/v') && contains(github.ref, 'rc')

.github/workflows/build_windows.yml

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,20 @@ on:
33
workflow_dispatch:
44
push:
55
branches:
6-
- "main"
6+
- "dev"
77
paths-ignore:
88
- "docs/**"
9-
- "**/.gitignore"
10-
- "**/.dockerignore"
9+
- ".gitignore"
1110
- LICENSE
12-
- "**/*.md"
13-
pull_request:
14-
branches:
15-
- "main"
16-
paths-ignore:
17-
- "docs/**"
18-
- "**/.gitignore"
19-
- "**/.dockerignore"
20-
- LICENSE
21-
- "**/*.md"
11+
- "*.md"
12+
# pull_request:
13+
# branches:
14+
# - "dev"
15+
# paths-ignore:
16+
# - "docs/**"
17+
# - ".gitignore"
18+
# - LICENSE
19+
# - "*.md"
2220

2321
env:
2422
CARGO_TERM_COLOR: always
@@ -38,7 +36,6 @@ jobs:
3836
# env: x86_64
3937
- arch: ucrt64-x86_64-windows-gnu
4038
os: windows-latest
41-
target: x86_64-pc-windows-gnu
4239
msystem: ucrt64
4340
env: ucrt-x86_64
4441

@@ -75,15 +72,18 @@ jobs:
7572
if: ${{ !startsWith(github.ref, 'refs/tags/') }}
7673
shell: pwsh
7774
run: |
78-
$json = curl -s "https://api.github.com/repos/shinchiro/mpv-winbuild-cmake/releases/latest" | ConvertFrom-Json
79-
$asset = $json.assets | Where-Object { $_.name -match "mpv-dev-x86_64-\d{8}-git" } | Select-Object -First 1
80-
curl -L -o $asset.name $asset.browser_download_url
81-
7z x -y $asset.name -olibmpv
82-
cp -force libmpv/libmpv.dll.a c:/msys64/${{ matrix.msystem }}/lib/
83-
cp -force libmpv/libmpv-2.dll c:/msys64/${{ matrix.msystem }}/bin/
84-
cp -force -recurse libmpv/include/mpv c:/msys64/${{ matrix.msystem }}/include/
85-
86-
- name: Build tsukimi-${{ matrix.target }}
75+
$api_gh = "https://api.github.com/repos/shinchiro/mpv-winbuild-cmake/releases/latest"
76+
$json = Invoke-WebRequest $api_gh -MaximumRedirection 0 -ErrorAction Ignore -UseBasicParsing | ConvertFrom-Json
77+
$filename = $json.assets | where { $_.name -Match "mpv-dev-x86_64-v3" } | Select-Object -ExpandProperty name
78+
$download_link = $json.assets | where { $_.name -Match "mpv-dev-x86_64-v3" } | Select-Object -ExpandProperty browser_download_url
79+
Write-Host "Downloading" $filename -ForegroundColor Green
80+
Invoke-WebRequest -Uri $download_link -UserAgent ([Microsoft.PowerShell.Commands.PSUserAgent]::FireFox) -OutFile $filename
81+
7z.exe x $filename -olibmpv
82+
cp -force libmpv/libmpv.dll.a c:/msys64/${{ matrix.msystem }}/lib
83+
cp -force libmpv/libmpv-2.dll c:/msys64/${{ matrix.msystem }}/bin
84+
cp -force -recurse libmpv/include/mpv c:/msys64/${{ matrix.msystem }}/include
85+
86+
- name: Build tsukimi-${{ matrix.arch }}
8787
if: ${{ !startsWith(github.ref, 'refs/tags/') }}
8888
shell: msys2 {0}
8989
run: |
@@ -162,10 +162,10 @@ jobs:
162162
if: ${{ !startsWith(github.ref, 'refs/tags/') }}
163163
uses: actions/upload-artifact@v4
164164
with:
165-
name: tsukimi-${{matrix.target}}
165+
name: tsukimi-${{matrix.arch}}
166166
path: |
167-
artifact/*.exe
168167
artifact/*.7z
168+
artifact/*.exe
169169
artifact/*.sha512sum
170170
compression-level: 0
171171
retention-days: 3

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
/i18n
33
/.idea
44
/backup
5+
/.cargo

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
1-
[submodule "libmpv2-rs"]
2-
path = libmpv2-rs
3-
url = https://github.com/tsukimi-rs/libmpv2-rs.git

0 commit comments

Comments
 (0)