Skip to content

Commit

Permalink
Merge pull request #12 from kanglong1023/develop
Browse files Browse the repository at this point in the history
confirm snapshot
  • Loading branch information
kanglong1023 authored Apr 15, 2023
2 parents ec1c8bf + 54da0b4 commit aacf59f
Show file tree
Hide file tree
Showing 6 changed files with 66 additions and 50 deletions.
24 changes: 0 additions & 24 deletions .github/workflows/maven-publish-push-main.yml

This file was deleted.

23 changes: 0 additions & 23 deletions .github/workflows/maven-publish.yml

This file was deleted.

32 changes: 32 additions & 0 deletions .github/workflows/release-mvn-snapshot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Publish SNAPSHOT
on:
workflow_dispatch:

jobs:
publish:
runs-on: ubuntu-latest
steps:
- name: Check out Git repository
uses: actions/checkout@v3
ref: 'develop'

- name: Install Java and Maven
uses: actions/setup-java@v3
with:
java-version: 8
distribution: 'adopt'
server-id: ossrh
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD

- id: install-secret-key
name: Install gpg secret key
run: |
cat <(echo -e "${{ secrets.GPG_SECRET }}") | gpg --batch --import
gpg --list-secret-keys --keyid-format LONG
- name: Publish Maven Central
env:
MAVEN_USERNAME: ${{ secrets.OSSRH_USER }}
MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
run: mvn --batch-mode -Dgpg.passphrase=${{ secrets.GPG_PASSWORD }} -P deploy clean deploy
31 changes: 31 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Publish to Maven Central Repository
on:
release:
types: [ created ]
jobs:
publish:
runs-on: ubuntu-latest
steps:
- name: Check out Git repository
uses: actions/checkout@v3

- name: Install Java and Maven
uses: actions/setup-java@v3
with:
java-version: 8
distribution: 'adopt'
server-id: ossrh
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD

- id: install-secret-key
name: Install gpg secret key
run: |
cat <(echo -e "${{ secrets.GPG_SECRET }}") | gpg --batch --import
gpg --list-secret-keys --keyid-format LONG
- name: Publish package
env:
MAVEN_USERNAME: ${{ secrets.OSSRH_USER }}
MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
run: mvn --batch-mode -Dgpg.passphrase=${{ secrets.GPG_PASSWORD }} -P deploy clean deploy
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ Alternatively, You can exclude ffmpeg dependencies if ffmpeg is installed on you

The program finally use local ffmpeg to merge the videos.

If you exclude ffmpeg dependencies and not installed on your local environment, try binary merge (`M3u8DownloadBuilder.mergeWithoutConvertToMp4())`). Most players support ts files.
If you exclude dependencies and ffmpeg is not installed on your local environment, try binary merge (`M3u8DownloadBuilder.mergeWithoutConvertToMp4())`). Most players support ts files.

## Usage

Expand All @@ -174,7 +174,7 @@ public class Main {

### Quickstart

plain download tasks can use the api of M3u8Downloads, just like:
Plain download tasks can use the api of M3u8Downloads, just like:

```java
import io.github.kanglong1023.m3u8.M3u8Downloads.M3u8HttpHeader;
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>io.github.kanglong1023</groupId>
<artifactId>m3u8-catcher</artifactId>
<version>1.0</version>
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>M3U8 Catcher</name>
Expand Down

0 comments on commit aacf59f

Please sign in to comment.