From db5bcacc0ee13207777caf154edc99e2dc582b5b Mon Sep 17 00:00:00 2001 From: ciscon Date: Fri, 16 Feb 2024 14:23:37 -0500 Subject: [PATCH 1/2] COMPILE: fix strlcat function definitions --- src/qtv.h | 2 +- src/sys.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qtv.h b/src/qtv.h index b79885c..c169e86 100644 --- a/src/qtv.h +++ b/src/qtv.h @@ -160,7 +160,7 @@ int qvsnprintf(char *buffer, size_t count, const char *format, va_list argptr); #if defined(__linux__) || defined(_WIN32) || defined(__CYGWIN__) size_t strlcpy (char *dst, const char *src, size_t siz); -size_t strlcat (char *dst, char *src, size_t siz); +size_t strlcat (char *dst, const char *src, size_t siz); #endif #ifndef _WIN32 diff --git a/src/sys.c b/src/sys.c index 9a86116..ca407d5 100644 --- a/src/sys.c +++ b/src/sys.c @@ -101,7 +101,7 @@ size_t strlcpy(char *dst, const char *src, size_t siz) return(s - src - 1); /* count does not include NUL */ } -size_t strlcat(char *dst, char *src, size_t siz) +size_t strlcat(char *dst, const char *src, size_t siz) { register char *d = dst; register const char *s = src; From 6fc90cb429d4112971f0f79c8657ad41d2474ccd Mon Sep 17 00:00:00 2001 From: ciscon Date: Fri, 16 Feb 2024 14:27:31 -0500 Subject: [PATCH 2/2] PIPELINE: use ubuntu-latest images for build, 18.04 no longer available remove arch specific pkg-config use checkout v4 as v2 is deprecated --- .github/workflows/build-and-deploy-release.yml | 6 +++--- .github/workflows/build-and-deploy-snapshot.yml | 6 +++--- .github/workflows/build-targets.yml | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-and-deploy-release.yml b/.github/workflows/build-and-deploy-release.yml index 496798a..fa6e65c 100644 --- a/.github/workflows/build-and-deploy-release.yml +++ b/.github/workflows/build-and-deploy-release.yml @@ -5,7 +5,7 @@ on: jobs: build: if: github.repository == 'QW-Group/qtv' - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest strategy: fail-fast: false matrix: @@ -37,12 +37,12 @@ jobs: ext: ".exe" steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Prepare Build Environemnt run: | sudo apt-get update sudo apt-get -y install build-essential cmake gcc-i686-linux-gnu - sudo apt-get -y install gcc-arm-linux-gnueabihf pkg-config-arm-linux-gnueabihf libc6-dev-armhf-cross gcc-aarch64-linux-gnu libc6-dev-arm64-cross + sudo apt-get -y install gcc-arm-linux-gnueabihf libc6-dev-armhf-cross gcc-aarch64-linux-gnu libc6-dev-arm64-cross sudo apt-get -y install gcc-mingw-w64-x86-64 gcc-mingw-w64-i686 - name: Build run: | diff --git a/.github/workflows/build-and-deploy-snapshot.yml b/.github/workflows/build-and-deploy-snapshot.yml index 1f36389..b1ad486 100644 --- a/.github/workflows/build-and-deploy-snapshot.yml +++ b/.github/workflows/build-and-deploy-snapshot.yml @@ -3,7 +3,7 @@ on: [push] jobs: build: if: github.repository == 'QW-Group/qtv' - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest strategy: fail-fast: false matrix: @@ -35,12 +35,12 @@ jobs: ext: ".exe" steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Prepare Build Environemnt run: | sudo apt-get update sudo apt-get -y install build-essential cmake gcc-i686-linux-gnu - sudo apt-get -y install gcc-arm-linux-gnueabihf pkg-config-arm-linux-gnueabihf libc6-dev-armhf-cross gcc-aarch64-linux-gnu libc6-dev-arm64-cross + sudo apt-get -y install gcc-arm-linux-gnueabihf libc6-dev-armhf-cross gcc-aarch64-linux-gnu libc6-dev-arm64-cross sudo apt-get -y install gcc-mingw-w64-x86-64 gcc-mingw-w64-i686 - name: Build run: | diff --git a/.github/workflows/build-targets.yml b/.github/workflows/build-targets.yml index 4ea71b0..8a8cbeb 100644 --- a/.github/workflows/build-targets.yml +++ b/.github/workflows/build-targets.yml @@ -3,7 +3,7 @@ on: [pull_request] jobs: build: if: github.repository == 'QW-Group/qtv' - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest strategy: fail-fast: false matrix: @@ -35,12 +35,12 @@ jobs: ext: ".exe" steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Prepare Build Environemnt run: | sudo apt-get update sudo apt-get -y install build-essential cmake gcc-i686-linux-gnu - sudo apt-get -y install gcc-arm-linux-gnueabihf pkg-config-arm-linux-gnueabihf libc6-dev-armhf-cross gcc-aarch64-linux-gnu libc6-dev-arm64-cross + sudo apt-get -y install gcc-arm-linux-gnueabihf libc6-dev-armhf-cross gcc-aarch64-linux-gnu libc6-dev-arm64-cross sudo apt-get -y install gcc-mingw-w64-x86-64 gcc-mingw-w64-i686 - name: Build run: |