6 Commits

Author SHA1 Message Date
klemek 489a08e102 fix: small fix in --help
Clang Lint CI / lint (push) Successful in 54s
Clang Build CI / run (push) Successful in 57s
Clang Build CI / build-release (push) Successful in 1m13s
2026-05-03 21:54:49 +02:00
klemek 4c8c587970 docs: update README 2026-05-03 21:44:30 +02:00
klemek fd1af94480 build: update PKGBUILD 2026-05-03 19:38:49 +02:00
klemek a02e79d8af tools: add .editorconfig 2026-05-03 19:31:18 +02:00
klemek dcf30ee389 ci: separate build and lint pipelines 2026-05-03 19:29:39 +02:00
klemek e79fa7fdd1 update doc 2025-09-24 16:15:46 +02:00
7 changed files with 68 additions and 26 deletions
+16
View File
@@ -0,0 +1,16 @@
# EditorConfig is awesome: https://EditorConfig.org
# top-most EditorConfig file
root = true
[*]
indent_style = space
indent_size = 4
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
[{Makefile.*,Makefile}]
indent_style = tab
indent_size = 2
@@ -1,10 +1,18 @@
name: C-lang CI name: Clang Build CI
concurrency:
group: build-${{ github.ref }}
cancel-in-progress: true
on: on:
workflow_dispatch:
push: push:
branches: ["master"] paths:
pull_request: - '.github/workflows/build.yml'
branches: ["master"] - 'src/*.c'
- 'src/*.h'
- 'configure.ac'
- 'Makefile.am'
env: env:
GCC_ARGS: src/*.c src/*.h -Ofast GCC_ARGS: src/*.c src/*.h -Ofast
@@ -12,18 +20,11 @@ env:
TEST_ARGS: "" TEST_ARGS: ""
jobs: jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: gcc
run: gcc -v -Wall -Wextra -Werror $GCC_ARGS
build-release: build-release:
needs: lint
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - name: Checkout repository
uses: actions/checkout@v4
- name: aclocal - name: aclocal
run: aclocal run: aclocal
- name: autoconf - name: autoconf
@@ -38,10 +39,10 @@ jobs:
run: make distcheck run: make distcheck
run: run:
needs: lint
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - name: Checkout repository
uses: actions/checkout@v5
- name: gcc - name: gcc
run: mkdir -p build && gcc $GCC_ARGS -o build/$TARGET run: mkdir -p build && gcc $GCC_ARGS -o build/$TARGET
- name: run program - name: run program
+25
View File
@@ -0,0 +1,25 @@
name: Clang Lint CI
concurrency:
group: lint-${{ github.ref }}
cancel-in-progress: true
on:
workflow_dispatch:
push:
paths:
- '.github/workflows/lint.yml'
- 'src/*.c'
- 'src/*.h'
env:
GCC_ARGS: src/*.c src/*.h -Ofast
jobs:
lint:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v5
- name: gcc
run: gcc -v -Wall -Wextra -Werror $GCC_ARGS
+1 -1
View File
@@ -24,4 +24,4 @@ configure
src/margen* src/margen*
*.pkg.tar.zst *.pkg.tar.zst
pkg pkg
margen-* margen-*
+2 -2
View File
@@ -3,8 +3,8 @@ pkgver=1.2.6
pkgrel=1 pkgrel=1
pkgdesc="Generate a marble-like pattern bitmap image, blazing fast." pkgdesc="Generate a marble-like pattern bitmap image, blazing fast."
arch=('i686' 'pentium4' 'x86_64' 'arm' 'armv7h' 'armv6h' 'aarch64' 'riscv64') arch=('i686' 'pentium4' 'x86_64' 'arm' 'armv7h' 'armv6h' 'aarch64' 'riscv64')
url="https://github.com/klemek/margen" url="https://git.klemek.fr/klemek/margen"
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/klemek/margen/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz") source=("${pkgname}-${pkgver}.tar.gz::https://git.klemek.fr/klemek/margen/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz")
sha256sums=('e35368e963dbc81e94c4fab50cf2aa5d0f56caf6079e204ca4608eb9835670bc') sha256sums=('e35368e963dbc81e94c4fab50cf2aa5d0f56caf6079e204ca4608eb9835670bc')
srcdir=build srcdir=build
+6 -6
View File
@@ -1,4 +1,4 @@
[![C-lang CI](https://github.com/klemek/margen/actions/workflows/ci.yml/badge.svg)](https://github.com/klemek/margen/actions/workflows/ci.yml) [![](https://git.klemek.fr/klemek/margen/actions/workflows/lint.yml/badge.svg?branch=main&style=flat-square)](https://git.klemek.fr/klemek/margen/actions?workflow=lint.yml) [![](https://git.klemek.fr/klemek/margen/actions/workflows/build.yml/badge.svg?branch=main&style=flat-square)](https://git.klemek.fr/klemek/margen/actions?workflow=build.yml)
# margen # margen
@@ -14,7 +14,7 @@ Written in pure C without librairies.
### From release ### From release
See [Releases](https://github.com/klemek/margen/releases) See [Releases](https://git.klemek.fr/klemek/margen/releases)
```sh ```sh
tar xvzf margen-x.y.z.tar.gz tar xvzf margen-x.y.z.tar.gz
@@ -27,7 +27,7 @@ make install
### From repository (PKGBUILD) ### From repository (PKGBUILD)
```sh ```sh
git clone https://github.com/klemek/margen git clone https://git.klemek.fr/klemek/margen
cd margen cd margen
makepkg -si makepkg -si
``` ```
@@ -36,7 +36,7 @@ makepkg -si
### From repository (dev version) ### From repository (dev version)
```sh ```sh
git clone https://github.com/klemek/margen git clone https://git.klemek.fr/klemek/margen
cd margen cd margen
aclocal aclocal
autoconf autoconf
@@ -84,10 +84,10 @@ sha256sum build/margen-x.y.z.tar.gz
$EDITOR PKGBUILD $EDITOR PKGBUILD
# push to repo # push to repo
git commit -am "margen vX.Y.Z" git commit -am "margen vX.Y.Z"
git tag vX.Y.Z git tag vX.Y.Z -m "margen vX.Y.Z"
git push origin master --tags git push origin master --tags
# create release from tag on github # create release from tag on github
# attach .tar.gz to the github release # attach .tar.gz to the github release
make -f Makefile.dev release-arch make -f Makefile.dev release-arch
# attach .pkg.tar.zst to the github release # attach .pkg.tar.zst to the github release
``` ```
+2 -2
View File
@@ -20,7 +20,7 @@ static void print_help(int status_code) {
"[-w=WIDTH] " "[-w=WIDTH] "
"[-h=HEIGHT] " "[-h=HEIGHT] "
"[-o=PATH] " "[-o=PATH] "
"[--seed=SEED]" "[--seed=SEED] "
"[-p=PIXEL_SIZE] " "[-p=PIXEL_SIZE] "
"[-s=SLOPE] " "[-s=SLOPE] "
"[-c=R,G,B] " "[-c=R,G,B] "
@@ -228,4 +228,4 @@ Parameters args_parse(int argc, char **argv) {
} }
return params; return params;
} }