From dcbfd4c98b2dad64c161796b0ca62bdb8884c13d Mon Sep 17 00:00:00 2001 From: david Date: Tue, 3 Nov 2026 16:00:52 -0300 Subject: [PATCH] changed ci/cd a bit --- .gitea/workflows/ci.yml | 7 +++++++ .gitea/workflows/release.yml | 33 ++++++++++++++++++++++++++------- src/main.c | 3 +-- 3 files changed, 34 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 6a31efe..2da14e4 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -12,3 +12,10 @@ jobs: - uses: actions/checkout@v4 - run: ./configure && make - run: ./mikusays -V && ./mikusays "hi" + + windows-cross: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - run: sudo apt-get update && sudo apt-get install -y gcc-mingw-w64-x86-64 + - run: ./configure --host=x86_64-w64-mingw32 && make diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 12ab226..6f93b07 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -5,7 +5,6 @@ on: tags: ["v*"] jobs: - # builds the source tarball (configure included) and checks tag == configure.ac version dist: runs-on: ubuntu-latest steps: @@ -44,17 +43,37 @@ jobs: strip mikusays ./mikusays -V ./mikusays "hi" > /dev/null - out=mikusays-$VERSION-linux-x86_64 - mkdir "$out" - cp mikusays LICENSE README.md "$out"/ - tar czf ../"$out".tar.gz "$out" + mv mikusays ../mikusays-$VERSION-linux-x86_64 - uses: actions/upload-artifact@v3 with: name: bin-linux-x86_64 - path: mikusays-*-linux-x86_64.tar.gz + path: mikusays-*-linux-x86_64 + + build-windows: + needs: dist + runs-on: ubuntu-latest + steps: + - name: install compiler + run: sudo apt-get update && sudo apt-get install -y build-essential gcc-mingw-w64-x86-64 + - uses: actions/download-artifact@v3 + with: + name: dist + - name: build and package + run: | + VERSION=${GITHUB_REF_NAME#v} + tar xf mikusays-$VERSION.tar.gz + cd mikusays-$VERSION + ./configure --host=x86_64-w64-mingw32 LDFLAGS="-static" + make + x86_64-w64-mingw32-strip mikusays.exe + mv mikusays.exe ../mikusays-$VERSION-windows-x86_64.exe + - uses: actions/upload-artifact@v3 + with: + name: bin-windows-x86_64 + path: mikusays-*-windows-x86_64.exe release: - needs: [dist, build] + needs: [dist, build, build-windows] runs-on: ubuntu-latest steps: - uses: actions/download-artifact@v3 diff --git a/src/main.c b/src/main.c index aae7d29..c3d1e9a 100644 --- a/src/main.c +++ b/src/main.c @@ -480,8 +480,7 @@ static int usage_error(const char *format, ...){ } //returns 1 if argv[*index] is this option; *value stays NULL when the value is missing -static int match_value_option(int argc, char **argv, int *index, const char *long_name, - char short_name, const char **value){ +static int match_value_option(int argc, char **argv, int *index, const char *long_name, char short_name, const char **value){ const char *argument = argv[*index]; size_t long_length = strlen(long_name);