Skip to content

Commit 484c23d

Browse files
authored
Merge pull request #22 from makbn/master
keep changes in sync
2 parents d77a462 + c735cad commit 484c23d

File tree

4 files changed

+56
-3
lines changed

4 files changed

+56
-3
lines changed

.github/workflows/github-action-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Java JThumbnail Build
22
#
3-
on: [ push ]
3+
on: [ push, workflow_dispatch ]
44
#
55
jobs:
66
build:
@@ -61,4 +61,4 @@ jobs:
6161
env:
6262
GITHUB_USERNAME: makbn
6363
GITHUB_ACTOR: makbn
64-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
64+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# Sample workflow for building and deploying a Jekyll site to GitHub Pages
2+
name: Deploy Jekyll with GitHub Pages dependencies preinstalled
3+
4+
on:
5+
# Runs on pushes targeting the default branch
6+
push:
7+
branches: ["master"]
8+
9+
# Allows you to run this workflow manually from the Actions tab
10+
workflow_dispatch:
11+
12+
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
13+
permissions:
14+
contents: read
15+
pages: write
16+
id-token: write
17+
18+
# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
19+
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
20+
concurrency:
21+
group: "pages"
22+
cancel-in-progress: false
23+
24+
jobs:
25+
# Build job
26+
build:
27+
runs-on: ubuntu-latest
28+
steps:
29+
- name: Checkout
30+
uses: actions/checkout@v4
31+
- name: Setup Pages
32+
uses: actions/configure-pages@v4
33+
- name: Build with Jekyll
34+
uses: actions/jekyll-build-pages@v1
35+
with:
36+
source: ./
37+
destination: ./_site
38+
- name: Upload artifact
39+
uses: actions/upload-pages-artifact@v3
40+
41+
# Deployment job
42+
deploy:
43+
environment:
44+
name: github-pages
45+
url: ${{ steps.deployment.outputs.page_url }}
46+
runs-on: ubuntu-latest
47+
needs: build
48+
steps:
49+
- name: Deploy to GitHub Pages
50+
id: deployment
51+
uses: actions/deploy-pages@v4

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ JThumbnail is a Java library for creating Thumbnails of common types of file inc
1111
- Check the `release/**` branches for stable release versions
1212
- `master` branch will always point to the latest available release version
1313

14+
Project Source: https://github.com/makbn/JThumbnail
15+
1416
## How to use
1517

1618
```jshelllanguage

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ dependencies {
6161
}
6262

6363
group = 'io.github.makbn'
64-
version = 'v2.1.0'
64+
version = 'v2.2.0'
6565
description = 'JThumbnail is a Java library for creating Thumbnails of common types of files'
6666
java.sourceCompatibility = JavaVersion.VERSION_17
6767

0 commit comments

Comments
 (0)