From 5df529e86ff11467958dc29a7e52e94a8b4e28f8 Mon Sep 17 00:00:00 2001 From: "Maxim [maxirmx] Samsonov" Date: Sun, 2 Jun 2024 00:09:11 +0300 Subject: [PATCH] Updated GHA actions --- .github/workflows/build-and-test-deb.yml | 4 ++-- .github/workflows/build-and-test-msys.yml | 6 +++--- .github/workflows/build-and-test-rh.yml | 12 ++++++++++-- .github/workflows/build-and-test.yml | 10 +++++----- .github/workflows/codeql.yml | 4 ++-- .github/workflows/coverage.yml | 4 ++-- .github/workflows/coverity.yml | 6 +++--- .github/workflows/lint.yml | 6 +++--- .github/workflows/nix.yml | 6 +++--- include/sexpp/sexp.h | 4 ++-- src/sexp-input.cpp | 2 +- src/sexp-simple-string.cpp | 2 +- tests/src/primitives-tests.cpp | 2 +- 13 files changed, 38 insertions(+), 30 deletions(-) diff --git a/.github/workflows/build-and-test-deb.yml b/.github/workflows/build-and-test-deb.yml index a9c0eb4..89cdbc0 100644 --- a/.github/workflows/build-and-test-deb.yml +++ b/.github/workflows/build-and-test-deb.yml @@ -1,5 +1,5 @@ # -# Copyright 2021-2023 Ribose Inc. (https://www.ribose.com) +# Copyright 2021-2024 Ribose Inc. (https://www.ribose.com) # # Permission is hereby granted, free of charge, to any person obtaining a copy of # this software and associated documentation files (the "Software"), to deal in @@ -98,7 +98,7 @@ jobs: # i386 supports actions/checkout@v1 only (no Node.js 32-bit binary) # and and actions/checkout@v1 has some issues with nested repositories if: startsWith(matrix.image, 'amd64') - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: kward/shunit2 path: ${{github.workspace}}/tests/shunit2 diff --git a/.github/workflows/build-and-test-msys.yml b/.github/workflows/build-and-test-msys.yml index 99e2096..9223a41 100644 --- a/.github/workflows/build-and-test-msys.yml +++ b/.github/workflows/build-and-test-msys.yml @@ -1,5 +1,5 @@ # -# Copyright 2021-2023 Ribose Inc. (https://www.ribose.com) +# Copyright 2021-2024 Ribose Inc. (https://www.ribose.com) # # Permission is hereby granted, free of charge, to any person obtaining a copy of # this software and associated documentation files (the "Software"), to deal in @@ -48,7 +48,7 @@ jobs: shared: [on, off] steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 1 @@ -77,7 +77,7 @@ jobs: run: ctest --test-dir build --output-on-failure - name: Checkout shell test framework - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: kward/shunit2 path: ${{ github.workspace }}/tests/shunit2 diff --git a/.github/workflows/build-and-test-rh.yml b/.github/workflows/build-and-test-rh.yml index 65f88a9..dee948a 100644 --- a/.github/workflows/build-and-test-rh.yml +++ b/.github/workflows/build-and-test-rh.yml @@ -1,5 +1,5 @@ # -# Copyright 2021-2023 Ribose Inc. (https://www.ribose.com) +# Copyright 2021-2024 Ribose Inc. (https://www.ribose.com) # # Permission is hereby granted, free of charge, to any person obtaining a copy of # this software and associated documentation files (the "Software"), to deal in @@ -41,7 +41,7 @@ jobs: strategy: fail-fast: false matrix: - image: [ 'centos:7', 'tgagor/centos:stream8', 'quay.io/centos/centos:stream9', 'fedora:35', 'fedora:36' ] + image: [ 'centos:7', 'tgagor/centos:stream8', 'quay.io/centos/centos:stream9', 'fedora:35', 'fedora:36', 'fedora:38' ] env: [ {CC: gcc, CXX: g++}, {CC: clang, CXX: clang++} ] shared: [ on, off ] container: ${{ matrix.image }} @@ -61,6 +61,14 @@ jobs: run: yum -y install sudo git gcc gcc-c++ make cmake clang - name: Checkout + if: matrix.image != 'centos:7' + uses: actions/checkout@v4 + with: + fetch-depth: 1 + +# CentOS 7 doesn't support node.js:20. To be removed once it is EOLed at June, 2024. + - name: Checkout centos:7 + if: matrix.image == 'centos:7' uses: actions/checkout@v3 with: fetch-depth: 1 diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index ca1ffa6..eb8989e 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -1,5 +1,5 @@ # -# Copyright 2021-2023 Ribose Inc. (https://www.ribose.com) +# Copyright 2021-2024 Ribose Inc. (https://www.ribose.com) # # Permission is hereby granted, free of charge, to any person obtaining a copy of # this software and associated documentation files (the "Software"), to deal in @@ -55,7 +55,7 @@ jobs: env: ${{ matrix.env }} steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 1 @@ -77,7 +77,7 @@ jobs: run: ctest --test-dir build --output-on-failure - name: Checkout shell test framework - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: kward/shunit2 path: ${{github.workspace}}/tests/shunit2 @@ -94,7 +94,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 1 @@ -125,7 +125,7 @@ jobs: CXX: clang++ steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 1 diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index ed38ede..54e57e2 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -1,5 +1,5 @@ # -# Copyright 2021-2023 Ribose Inc. (https://www.ribose.com) +# Copyright 2021-2024 Ribose Inc. (https://www.ribose.com) # # Permission is hereby granted, free of charge, to any person obtaining a copy of # this software and associated documentation files (the "Software"), to deal in @@ -50,7 +50,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 55df2ff..041f94d 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -1,5 +1,5 @@ # -# Copyright 2021-2023 Ribose Inc. (https://www.ribose.com) +# Copyright 2021-2024 Ribose Inc. (https://www.ribose.com) # # Permission is hereby granted, free of charge, to any person obtaining a copy of # this software and associated documentation files (the "Software"), to deal in @@ -41,7 +41,7 @@ jobs: MAKEFLAGS: j4 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 1 diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml index 5c74eeb..f3541de 100644 --- a/.github/workflows/coverity.yml +++ b/.github/workflows/coverity.yml @@ -1,5 +1,5 @@ # -# Copyright 2021-2023 Ribose Inc. (https://www.ribose.com) +# Copyright 2021-2024 Ribose Inc. (https://www.ribose.com) # # Permission is hereby granted, free of charge, to any person obtaining a copy of # this software and associated documentation files (the "Software"), to deal in @@ -41,7 +41,7 @@ jobs: COVERITY_TOKEN: qjcM1CWLcq9PJB3yL0ZXIw steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 1 @@ -60,4 +60,4 @@ jobs: with: email: maxirmx@sw.consulting token: ${{ env.COVERITY_TOKEN }} - command: cmake --build build + command: cmake --build build diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 0a80e40..6703855 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,5 +1,5 @@ # -# Copyright 2021-2023 Ribose Inc. (https://www.ribose.com) +# Copyright 2021-2024 Ribose Inc. (https://www.ribose.com) # # Permission is hereby granted, free of charge, to any person obtaining a copy of # this software and associated documentation files (the "Software"), to deal in @@ -35,7 +35,7 @@ jobs: clang-format: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: DoozyX/clang-format-lint-action@v0.11 with: source: '.' @@ -52,5 +52,5 @@ jobs: shellcheck: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: ludeeus/action-shellcheck@master diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index ed19bce..34310b2 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -1,5 +1,5 @@ # -# Copyright 2021-2023 Ribose Inc. (https://www.ribose.com) +# Copyright 2021-2024 Ribose Inc. (https://www.ribose.com) # # Permission is hereby granted, free of charge, to any person obtaining a copy of # this software and associated documentation files (the "Software"), to deal in @@ -41,7 +41,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 1 @@ -54,7 +54,7 @@ jobs: run: nix build - name: Checkout shell test framework - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: kward/shunit2 path: ${{github.workspace}}/tests/shunit2 diff --git a/include/sexpp/sexp.h b/include/sexpp/sexp.h index 7e67d93..de0d093 100644 --- a/include/sexpp/sexp.h +++ b/include/sexpp/sexp.h @@ -105,8 +105,8 @@ class SEXP_PUBLIC_SYMBOL sexp_simple_string_t : public std::vector, private sexp_char_defs_t { public: sexp_simple_string_t(void) = default; - sexp_simple_string_t(const octet_t *dt) : std::vector() { for (; *dt; ++dt) push_back(*dt); } - sexp_simple_string_t(const octet_t *bt, size_t ln) : std::vector(ln) { for (size_t s = 0; s < ln; ++bt, ++s ) push_back(*bt); } + sexp_simple_string_t(const octet_t *dt); + sexp_simple_string_t(const octet_t *bt, size_t ln); sexp_simple_string_t &append(int c) { push_back((octet_t)(c & 0xFF)); diff --git a/src/sexp-input.cpp b/src/sexp-input.cpp index 3538497..0c513b9 100644 --- a/src/sexp-input.cpp +++ b/src/sexp-input.cpp @@ -1,6 +1,6 @@ /** * - * Copyright 2021-2023 Ribose Inc. (https://www.ribose.com) + * Copyright 2021-2024 Ribose Inc. (https://www.ribose.com) * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in diff --git a/src/sexp-simple-string.cpp b/src/sexp-simple-string.cpp index 3029850..40c8ec0 100644 --- a/src/sexp-simple-string.cpp +++ b/src/sexp-simple-string.cpp @@ -1,6 +1,6 @@ /** * - * Copyright 2021-2023 Ribose Inc. (https://www.ribose.com) + * Copyright 2021-2024 Ribose Inc. (https://www.ribose.com) * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in diff --git a/tests/src/primitives-tests.cpp b/tests/src/primitives-tests.cpp index 64b4b4f..74222bc 100644 --- a/tests/src/primitives-tests.cpp +++ b/tests/src/primitives-tests.cpp @@ -1,6 +1,6 @@ /** * - * Copyright 2021-2023 Ribose Inc. (https://www.ribose.com) + * Copyright 2021-2024 Ribose Inc. (https://www.ribose.com) * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in