Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version 0.0.6 #82

Merged
merged 93 commits into from
Dec 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
2cea2ec
Bump github.com/essentialkaos/ek/v12 from 12.60.0 to 12.60.1
dependabot[bot] Mar 2, 2023
9b3abd6
Merge pull request #37 from essentialkaos/dependabot/go_modules/devel…
andyone Mar 2, 2023
e7cfcc0
Bump github.com/essentialkaos/ek/v12 from 12.60.1 to 12.61.0
dependabot[bot] Mar 9, 2023
65130b2
Merge pull request #38 from essentialkaos/dependabot/go_modules/devel…
andyone Mar 9, 2023
e7ffd93
Bump github.com/essentialkaos/ek/v12 from 12.61.0 to 12.62.0
dependabot[bot] Mar 10, 2023
5f95fc2
Merge pull request #39 from essentialkaos/dependabot/go_modules/devel…
andyone Mar 10, 2023
214da25
Bump github.com/essentialkaos/ek/v12 from 12.62.0 to 12.63.0
dependabot[bot] Mar 16, 2023
e9018b7
Bump actions/setup-go from 3 to 4
dependabot[bot] Mar 16, 2023
0385184
Merge pull request #41 from essentialkaos/dependabot/github_actions/d…
andyone Mar 16, 2023
d6881ac
Merge pull request #40 from essentialkaos/dependabot/go_modules/devel…
andyone Mar 16, 2023
01e183a
Improve README
andyone Mar 22, 2023
2814608
Merge branch 'develop' of github.com:essentialkaos/rsz into develop
andyone Mar 22, 2023
676935b
Bump github.com/essentialkaos/ek/v12 from 12.63.0 to 12.64.0
dependabot[bot] Apr 3, 2023
db880c1
Merge pull request #42 from essentialkaos/dependabot/go_modules/devel…
andyone Apr 3, 2023
7ee7400
Improve README
andyone Apr 18, 2023
30975fe
Fix typos
andyone Apr 18, 2023
9264e32
Improve CI workflow
andyone Apr 18, 2023
4f7d5ac
Improve CI workflow
andyone Apr 18, 2023
8023a5d
Bump github.com/essentialkaos/ek/v12 from 12.64.0 to 12.64.1
dependabot[bot] Apr 19, 2023
c825ec3
Merge pull request #43 from essentialkaos/dependabot/go_modules/devel…
andyone Apr 19, 2023
f6dd500
Bump github.com/essentialkaos/ek/v12 from 12.64.1 to 12.65.0
dependabot[bot] Apr 28, 2023
4d22307
Merge pull request #44 from essentialkaos/dependabot/go_modules/devel…
andyone Apr 28, 2023
ee8633c
Bump github.com/essentialkaos/ek/v12 from 12.65.0 to 12.66.0
dependabot[bot] May 4, 2023
0678931
Merge pull request #45 from essentialkaos/dependabot/go_modules/devel…
andyone May 4, 2023
2155470
Bump github.com/essentialkaos/ek/v12 from 12.66.0 to 12.67.0
dependabot[bot] May 8, 2023
de9bb73
Merge pull request #46 from essentialkaos/dependabot/go_modules/devel…
andyone May 9, 2023
4cce44e
Bump github.com/essentialkaos/depsy from 1.0.0 to 1.1.0
dependabot[bot] May 12, 2023
263469b
Merge pull request #47 from essentialkaos/dependabot/go_modules/devel…
andyone May 12, 2023
15d4ba0
Bump github.com/essentialkaos/ek/v12 from 12.67.0 to 12.67.1
dependabot[bot] May 15, 2023
46d48d0
Merge pull request #48 from essentialkaos/dependabot/go_modules/devel…
andyone May 15, 2023
0a0df73
Bump github.com/essentialkaos/ek/v12 from 12.67.1 to 12.68.0
dependabot[bot] Jun 29, 2023
194cc11
Merge pull request #49 from essentialkaos/dependabot/go_modules/devel…
andyone Jun 29, 2023
ce16762
Bump github.com/essentialkaos/ek/v12 from 12.68.0 to 12.69.0
dependabot[bot] Jul 14, 2023
2a1f722
Merge pull request #50 from essentialkaos/dependabot/go_modules/devel…
andyone Jul 14, 2023
2fbbe7b
Improve CI workflow
andyone Jul 14, 2023
13f85c8
Bump github.com/essentialkaos/ek/v12 from 12.69.0 to 12.70.0
dependabot[bot] Jul 17, 2023
c9585b0
Merge pull request #51 from essentialkaos/dependabot/go_modules/devel…
andyone Jul 17, 2023
9a85a02
Bump github.com/essentialkaos/ek/v12 from 12.70.0 to 12.72.0
dependabot[bot] Jul 25, 2023
233d699
Merge pull request #53 from essentialkaos/dependabot/go_modules/devel…
andyone Jul 25, 2023
b285123
Bump github.com/essentialkaos/ek/v12 from 12.72.0 to 12.73.1
dependabot[bot] Jul 27, 2023
1912039
Merge pull request #54 from essentialkaos/dependabot/go_modules/devel…
andyone Jul 27, 2023
60e1c4c
Bump github.com/essentialkaos/ek/v12 from 12.73.1 to 12.73.2
dependabot[bot] Aug 1, 2023
aebe12c
Merge pull request #55 from essentialkaos/dependabot/go_modules/devel…
andyone Aug 1, 2023
0f1a34c
Bump github.com/essentialkaos/ek/v12 from 12.73.2 to 12.75.1
dependabot[bot] Aug 4, 2023
8dd3d62
Merge pull request #57 from essentialkaos/dependabot/go_modules/devel…
andyone Aug 4, 2023
7e5c6c8
Bump actions/checkout from 3 to 4
dependabot[bot] Sep 5, 2023
f3f01f7
Merge pull request #58 from essentialkaos/dependabot/github_actions/d…
andyone Sep 5, 2023
2279e0e
Bump docker/build-push-action from 4 to 5
dependabot[bot] Sep 13, 2023
6c3c45f
Bump docker/login-action from 2 to 3
dependabot[bot] Sep 13, 2023
615ecb8
Merge pull request #60 from essentialkaos/dependabot/github_actions/d…
andyone Sep 13, 2023
18622ab
Merge pull request #59 from essentialkaos/dependabot/github_actions/d…
andyone Sep 13, 2023
1a7b90d
Bump github.com/essentialkaos/ek/v12 from 12.75.1 to 12.76.1
dependabot[bot] Sep 15, 2023
05d9a00
Merge pull request #61 from essentialkaos/dependabot/go_modules/devel…
andyone Sep 18, 2023
28b5cdd
Bump github.com/essentialkaos/ek/v12 from 12.76.1 to 12.77.1
dependabot[bot] Sep 25, 2023
95da8db
Merge pull request #62 from essentialkaos/dependabot/go_modules/devel…
andyone Sep 25, 2023
0f1cd4d
Bump github.com/essentialkaos/ek/v12 from 12.77.1 to 12.78.0
dependabot[bot] Sep 29, 2023
b599880
Merge pull request #63 from essentialkaos/dependabot/go_modules/devel…
andyone Sep 29, 2023
4b8355b
Bump github.com/essentialkaos/ek/v12 from 12.78.0 to 12.79.0
dependabot[bot] Oct 3, 2023
0eca522
Merge pull request #64 from essentialkaos/dependabot/go_modules/devel…
andyone Oct 3, 2023
2ac95d6
Bump github.com/essentialkaos/ek/v12 from 12.79.0 to 12.80.0
dependabot[bot] Oct 13, 2023
4ed2c54
Merge pull request #65 from essentialkaos/dependabot/go_modules/devel…
andyone Oct 13, 2023
85bdccd
Bump github.com/essentialkaos/ek/v12 from 12.80.0 to 12.82.0
dependabot[bot] Oct 17, 2023
c9026dc
Merge pull request #66 from essentialkaos/dependabot/go_modules/devel…
andyone Oct 17, 2023
7024f82
Bump github.com/essentialkaos/ek/v12 from 12.82.0 to 12.83.1
dependabot[bot] Oct 24, 2023
8b1bec6
Merge pull request #68 from essentialkaos/dependabot/go_modules/devel…
andyone Oct 25, 2023
9fa24e3
Bump github.com/essentialkaos/ek/v12 from 12.83.1 to 12.83.2
dependabot[bot] Nov 2, 2023
90a4d8c
Merge pull request #69 from essentialkaos/dependabot/go_modules/devel…
andyone Nov 2, 2023
641d25b
Bump github.com/essentialkaos/ek/v12 from 12.83.2 to 12.84.0
dependabot[bot] Nov 14, 2023
ecf0558
Merge pull request #71 from essentialkaos/dependabot/go_modules/devel…
andyone Nov 14, 2023
9225f7b
Bump github.com/essentialkaos/ek/v12 from 12.84.0 to 12.85.0
dependabot[bot] Nov 15, 2023
d050609
Merge pull request #72 from essentialkaos/dependabot/go_modules/devel…
andyone Nov 15, 2023
332c21e
Bump github.com/essentialkaos/ek/v12 from 12.85.0 to 12.86.0
dependabot[bot] Nov 17, 2023
e354ad7
Merge pull request #73 from essentialkaos/dependabot/go_modules/devel…
andyone Nov 17, 2023
71ca103
Bump github.com/essentialkaos/ek/v12 from 12.86.0 to 12.88.1
dependabot[bot] Nov 22, 2023
54bfe0d
Merge pull request #75 from essentialkaos/dependabot/go_modules/devel…
andyone Nov 22, 2023
ab309ad
Bump github.com/essentialkaos/ek/v12 from 12.88.1 to 12.90.0
dependabot[bot] Nov 27, 2023
716cc65
Merge pull request #76 from essentialkaos/dependabot/go_modules/devel…
andyone Nov 29, 2023
861a86e
Bump github.com/essentialkaos/ek/v12 from 12.90.0 to 12.90.1
dependabot[bot] Dec 4, 2023
4458045
Merge pull request #77 from essentialkaos/dependabot/go_modules/devel…
andyone Dec 4, 2023
102097b
Bump actions/setup-go from 4 to 5
dependabot[bot] Dec 7, 2023
f6a1134
Merge pull request #78 from essentialkaos/dependabot/github_actions/d…
andyone Dec 8, 2023
eb5b705
Bump github.com/essentialkaos/ek/v12 from 12.90.1 to 12.91.0
dependabot[bot] Dec 12, 2023
0f4d7aa
Merge pull request #79 from essentialkaos/dependabot/go_modules/devel…
andyone Dec 12, 2023
8db007f
Bump github.com/essentialkaos/ek/v12 from 12.91.0 to 12.92.0
dependabot[bot] Dec 14, 2023
5450759
Bump github/codeql-action from 2 to 3
dependabot[bot] Dec 14, 2023
18bfcc3
Merge pull request #81 from essentialkaos/dependabot/github_actions/d…
andyone Dec 14, 2023
dbe9045
Merge pull request #80 from essentialkaos/dependabot/go_modules/devel…
andyone Dec 14, 2023
3e2929f
Regenerate Makefile with the latest version of gomakegen
andyone Dec 25, 2023
dabfd25
Code refactoring
andyone Dec 25, 2023
d75d5aa
Update base container image to Alpine 3.17
andyone Dec 25, 2023
aecec71
Merge branch 'master' into develop
andyone Dec 25, 2023
a072f95
Update CI workflow
andyone Dec 25, 2023
0e5273a
Code refactoring
andyone Dec 25, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .docker/alpine.docker
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN apk add --no-cache git make && make deps && make all

## FINAL IMAGE #################################################################

FROM ${REGISTRY}/essentialkaos/alpine:3.15
FROM ${REGISTRY}/essentialkaos/alpine:3.17

LABEL org.opencontainers.image.title="rsz" \
org.opencontainers.image.description="Simple utility for image resizing" \
Expand Down
51 changes: 35 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,18 @@ on:
branches: [master, develop]
pull_request:
branches: [master]
workflow_dispatch:
inputs:
force_run:
description: 'Force workflow run'
required: true
type: choice
options: [yes, no]

permissions:
actions: read
contents: read
statuses: write

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -15,30 +27,23 @@ jobs:
name: Go
runs-on: ubuntu-latest

env:
SRC_DIR: src/github.com/${{ github.repository }}

strategy:
matrix:
go: [ '1.19.x', '1.20.x' ]
go: [ '1.20.x', '1.21.x' ]

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: ${{ matrix.go }}

- name: Checkout
uses: actions/checkout@v3
with:
path: ${{env.SRC_DIR}}

- name: Download dependencies
working-directory: ${{env.SRC_DIR}}
run: make deps

- name: Run tests
working-directory: ${{env.SRC_DIR}}
run: make all

Hadolint:
Expand All @@ -49,13 +54,27 @@ jobs:

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

- name: Check dockerfiles with Hadolint
uses: essentialkaos/hadolint-action@v1
with:
files: .docker/*.docker

Typos:
name: Typos
runs-on: ubuntu-latest

needs: Go

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Check spelling
continue-on-error: true
uses: crate-ci/typos@master

DockerBuild:
name: Docker Build Check
runs-on: ubuntu-latest
Expand All @@ -80,11 +99,11 @@ jobs:
# More info about issue: https://github.com/actions/runner/issues/491

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
if: ${{ github.event_name == 'pull_request' }}

- name: Login to DockerHub
uses: docker/login-action@v2
uses: docker/login-action@v3
env:
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
if: ${{ github.event_name == 'pull_request' && env.DOCKERHUB_USERNAME != '' }}
Expand All @@ -93,7 +112,7 @@ jobs:
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
if: ${{ github.event_name == 'pull_request' }}
with:
registry: ghcr.io
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 2

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: go

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
10 changes: 5 additions & 5 deletions .github/workflows/docker-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,18 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Login to DockerHub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand Down Expand Up @@ -135,7 +135,7 @@ jobs:

- name: Build and push Docker images (Docker)
if: ${{ steps.build_check.outputs.build == 'true' }}
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
push: true
context: .
Expand All @@ -148,7 +148,7 @@ jobs:

- name: Build and push Docker images (GHCR)
if: ${{ steps.build_check.outputs.build == 'true' }}
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
push: true
context: .
Expand Down
2 changes: 2 additions & 0 deletions .typos.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[files]
extend-exclude = ["go.sum"]
7 changes: 4 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
################################################################################

# This Makefile generated by GoMakeGen 2.2.0 using next command:
# This Makefile generated by GoMakeGen 2.3.0 using next command:
# gomakegen --mod .
#
# More info: https://kaos.sh/gomakegen
Expand All @@ -13,6 +13,7 @@ ifdef VERBOSE ## Print verbose information (Flag)
VERBOSE_FLAG = -v
endif

COMPAT ?= 1.18
MAKEDIR = $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
GITREV ?= $(shell test -s $(MAKEDIR)/.git && git rev-parse --short HEAD)

Expand Down Expand Up @@ -50,7 +51,7 @@ else
endif

ifdef COMPAT ## Compatible Go version (String)
go mod tidy $(VERBOSE_FLAG) -compat=$(COMPAT)
go mod tidy $(VERBOSE_FLAG) -compat=$(COMPAT) -go=$(COMPAT)
else
go mod tidy $(VERBOSE_FLAG)
endif
Expand Down Expand Up @@ -94,6 +95,6 @@ help: ## Show this info
| sed 's/ifdef //' \
| awk 'BEGIN {FS = " .*?## "}; {printf " \033[32m%-14s\033[0m %s\n", $$1, $$2}'
@echo -e ''
@echo -e '\033[90mGenerated by GoMakeGen 2.2.0\033[0m\n'
@echo -e '\033[90mGenerated by GoMakeGen 2.3.0\033[0m\n'

################################################################################
14 changes: 5 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#### From source

To build the `rsz` from scratch, make sure you have a working Go 1.19+ workspace (_[instructions](https://golang.org/doc/install)_), then:
To build the `rsz` from scratch, make sure you have a working Go 1.19+ workspace (_[instructions](https://go.dev/doc/install)_), then:

```
go install github.com/essentialkaos/rsz@latest
Expand All @@ -32,17 +32,13 @@ You can download prebuilt binaries for Linux and macOS from [EK Apps Repository]
bash <(curl -fsSL https://apps.kaos.st/get) rsz
```

#### Docker Image
#### Container Image

The latest version of `rsz` also available as Docker image on [Docker Hub](https://kaos.sh/d/rsz) and [GitHub Container Registry](https://kaos.sh/p/rsz):

```bash
docker run --rm -it essentialkaos/rsz:latest image.png 0.55 thumbnail.png
```

or
The latest version of `rsz` also available as container image on [Docker Hub](https://kaos.sh/d/rsz) and [GitHub Container Registry](https://kaos.sh/p/rsz):

```bash
podman run --rm -it ghcr.io/essentialkaos/rsz:latest image.png 0.55 thumbnail.png
# or
docker run --rm -it ghcr.io/essentialkaos/rsz:latest image.png 0.55 thumbnail.png
```

Expand Down
Loading
Loading