Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/itsHenry35/ledu
Browse files Browse the repository at this point in the history
  • Loading branch information
itsHenry35 committed Feb 7, 2024
2 parents b2292aa + 0a6d95b commit 85eaaef
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 23 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:
Build_Windows:
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.10.11

Expand All @@ -36,18 +36,18 @@ jobs:
file: D:\\a\\ledu\\ledu\\dist\\ledu_download_win64_${{ github.event.release.tag_name }}.exe

- name: Upload
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: "Windows-build"
path: "D:\\a\\ledu\\ledu\\dist"

Build_Linux:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.10.11

Expand All @@ -71,18 +71,18 @@ jobs:
file: /home/runner/work/ledu/ledu/dist/ledu_download_linux_amd64_${{ github.event.release.tag_name }}

- name: Upload
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: "Linux-build"
path: "/home/runner/work/ledu/ledu/dist"

Build_Macos:
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.10.11

Expand All @@ -109,7 +109,7 @@ jobs:
file: /Users/runner/work/ledu/ledu/ledu_download_macos_${{ github.event.release.tag_name }}.zip

- name: Upload
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: "MacOs-build"
path: "/Users/runner/work/ledu/ledu/ledu_download_macos/"
18 changes: 9 additions & 9 deletions .github/workflows/debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
runs-on: windows-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.10.11

Expand All @@ -41,7 +41,7 @@ jobs:
ren D:\a\ledu\ledu\dist\main.exe D:\a\ledu\ledu\dist\$FILENAME
- name: Upload
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: "Windows-build"
path: "D:\\a\\ledu\\ledu\\dist"
Expand All @@ -50,10 +50,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.10.11

Expand All @@ -76,7 +76,7 @@ jobs:
mv /home/runner/work/ledu/ledu/dist/main /home/runner/work/ledu/ledu/dist/$FILENAME
- name: Upload
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: "Linux-build"
path: "/home/runner/work/ledu/ledu/dist"
Expand All @@ -85,10 +85,10 @@ jobs:
runs-on: macos-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.10.11

Expand All @@ -111,7 +111,7 @@ jobs:
mv /Users/runner/work/ledu/ledu/dist/main /Users/runner/work/ledu/ledu/dist/$FILENAME
- name: Upload
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: "MacOs-build"
path: "/Users/runner/work/ledu/ledu/dist/"
8 changes: 4 additions & 4 deletions .github/workflows/jekyll-gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Pages
uses: actions/configure-pages@v2
uses: actions/configure-pages@v4
- name: Build with Jekyll
uses: actions/jekyll-build-pages@v1
with:
source: ./
destination: ./_site
- name: Upload artifact
uses: actions/upload-pages-artifact@v1
uses: actions/upload-pages-artifact@v3

# Deployment job
deploy:
Expand All @@ -44,4 +44,4 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v1
uses: actions/deploy-pages@v4
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,22 @@
# Changelog

## [2.0.0](https://github.com/itsHenry35/ledu/compare/v1.6.1...v2.0.0) (2024-02-07)


### ⚠ BREAKING CHANGES

* import aria2c from motrix

### Features

* import aria2c from motrix ([c432ff3](https://github.com/itsHenry35/ledu/commit/c432ff3a957e8be6117dfee4717535664ebab93b))
* new url place support and support for "无回放"courses ([149f762](https://github.com/itsHenry35/ledu/commit/149f7626bd90392b05afd44af301c40475d89e53))


### CI

* error debug aria2c path ([33275cf](https://github.com/itsHenry35/ledu/commit/33275cfb2963493eba834fbe1929bb962f0dc3e8))

## [1.6.1](https://github.com/itsHenry35/ledu/compare/v1.6.0...v1.6.1) (2023-12-24)


Expand Down

0 comments on commit 85eaaef

Please sign in to comment.