From 4ec6860106803b612c8adc22900a0eeedda35f9b Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 16 Sep 2021 15:26:40 -0500 Subject: [PATCH 01/36] Test Github actions to do ubuntu build --- .github/workflows/cmake.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/workflows/cmake.yml diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml new file mode 100644 index 0000000..c6e916b --- /dev/null +++ b/.github/workflows/cmake.yml @@ -0,0 +1,30 @@ +name: CMake + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +env: + # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) + BUILD_TYPE: Release + +jobs: + build-ubuntu: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-18.04, ubuntu-20.04] + + steps: + - uses: actions/checkout@v2 + - name: Configure CMake + # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. + # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type + run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} + + - name: Build + # Build your program with the given configuration + run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} + From 212fb7fbc50e7c192a4ae8005cb6b50d2be3dc66 Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 16 Sep 2021 15:31:20 -0500 Subject: [PATCH 02/36] Update cmake.yml --- .github/workflows/cmake.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index c6e916b..ccc1016 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -19,6 +19,9 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Install dependencies + run: sudo apt-get install libjansson-dev libcurl4-openssl-dev libreadline-dev + - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type From 8ce751d0768c8fa67a8d14bf7b6077504c619413 Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 16 Sep 2021 15:35:27 -0500 Subject: [PATCH 03/36] Test windows build --- .github/workflows/cmake.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index ccc1016..456a8a9 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -31,3 +31,12 @@ jobs: # Build your program with the given configuration run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} + build-windows: + runs-on: windows-2019 + + steps: + - uses: actions/checkout@v2 + + - name: Build + run: sh -xe travisWinBuild.sh + From 712955100ba9d92603b536d3a793acd30cc348db Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 16 Sep 2021 15:36:05 -0500 Subject: [PATCH 04/36] Update cmake.yml --- .github/workflows/cmake.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 456a8a9..3127400 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -34,9 +34,9 @@ jobs: build-windows: runs-on: windows-2019 - steps: - - uses: actions/checkout@v2 + steps: + - uses: actions/checkout@v2 - - name: Build - run: sh -xe travisWinBuild.sh + - name: Build + run: sh -xe travisWinBuild.sh From f13e554e017449d7b58c21181396733d874680ec Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 16 Sep 2021 15:42:17 -0500 Subject: [PATCH 05/36] Move windows build steps from script to steps --- .github/workflows/cmake.yml | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 3127400..08b7427 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -31,12 +31,36 @@ jobs: # Build your program with the given configuration run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} - build-windows: + build-windows-x64: runs-on: windows-2019 + env: + CMAKE_FLAGS: "-A x64" steps: - uses: actions/checkout@v2 + + - name: Get Curl + run: | + wget https://curl.se/windows/dl-7.76.1/curl-7.76.1-win64-mingw.zip + 7z x curl-7.76.1-win64-mingw.zip + mv curl-7.76.1-win64-mingw curl + cp curl/lib/libcurl.dll.a curl/lib/curl.lib + + - name: Get Jansson + run: | + wget -O jansson.lib https://github.com/pboyd04/jansson/releases/download/v2.11/$JANSSON_LIB + wget -O include/jansson.h https://github.com/pboyd04/jansson/releases/download/v2.11/jansson.h + wget -O include/jansson_config.h https://github.com/pboyd04/jansson/releases/download/v2.11/jansson_config.h + + - name: Get getopt.h + run: wget -O include/getopt.h https://raw.githubusercontent.com/skandhurkat/Getopt-for-Visual-Studio/master/getopt.h + - name: Configure CMake + # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. + # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type + run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} + - name: Build - run: sh -xe travisWinBuild.sh + # Build your program with the given configuration + run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} From 32d990b72509dc786d3f3865746d5f2c67b2c9d4 Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 16 Sep 2021 15:54:09 -0500 Subject: [PATCH 06/36] Update cmake.yml --- .github/workflows/cmake.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 08b7427..a1cf225 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -41,19 +41,19 @@ jobs: - name: Get Curl run: | - wget https://curl.se/windows/dl-7.76.1/curl-7.76.1-win64-mingw.zip - 7z x curl-7.76.1-win64-mingw.zip - mv curl-7.76.1-win64-mingw curl - cp curl/lib/libcurl.dll.a curl/lib/curl.lib + Invoke-WebRequest -Uri https://curl.se/windows/dl-7.76.1/curl-7.76.1-win64-mingw.zip -OutFile curl.zip + Expand-Archive curl.zip + Move-Item .\curl\*\* .\curl\ + Copy-Item .\curl\lib\libcurl.dll.a .\curl\lib\curl.lib - name: Get Jansson run: | - wget -O jansson.lib https://github.com/pboyd04/jansson/releases/download/v2.11/$JANSSON_LIB - wget -O include/jansson.h https://github.com/pboyd04/jansson/releases/download/v2.11/jansson.h - wget -O include/jansson_config.h https://github.com/pboyd04/jansson/releases/download/v2.11/jansson_config.h + Invoke-WebRequest -OutFile jansson.lib -Uri https://github.com/pboyd04/jansson/releases/download/v2.11/janssonx64.lib + Invoke-WebRequest -OutFile include/jansson.h -Uri https://github.com/pboyd04/jansson/releases/download/v2.11/jansson.h + Invoke-WebRequest -OutFile include/jansson_config.h -Uri https://github.com/pboyd04/jansson/releases/download/v2.11/jansson_config.h - name: Get getopt.h - run: wget -O include/getopt.h https://raw.githubusercontent.com/skandhurkat/Getopt-for-Visual-Studio/master/getopt.h + run: Invoke-WebRequest -OutFile include/getopt.h -Uri https://raw.githubusercontent.com/skandhurkat/Getopt-for-Visual-Studio/master/getopt.h - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. From ba34a720b98d307ab22678e42f80685af46cee8c Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 16 Sep 2021 16:00:59 -0500 Subject: [PATCH 07/36] Update cmake.yml --- .github/workflows/cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index a1cf225..8a498b4 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -58,7 +58,7 @@ jobs: - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type - run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} + run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCURL_LIBRARY=./curl/lib/curl.lib -DCURL_INCLUDE_DIR=./curl/include -DJANSSON_LIBRARIES=./jansson.lib -DJANSSON_INCLUDE_DIRS=./ - name: Build # Build your program with the given configuration From 183ca0ef5f1a3831b30a333a52da3c46ba8178ec Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 16 Sep 2021 17:46:20 -0500 Subject: [PATCH 08/36] Add windows check for local curl files --- CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index c7c7196..b0665c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,6 +36,11 @@ file(GLOB REDFISH_SRC src/*.c src/entities/*.c) source_group("Library Sources" FILES ${REDFISH_SRC}) +if (WIN32) +set(CURL_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/curl/include) +set(CURL_LIBRARY ${CMAKE_CURRENT_SOURCE_DIR}/curl/lib/curl.lib) +endif() + find_package(CURL REQUIRED) find_package(Jansson REQUIRED) find_package(CZMQ) From 5966991b6c6a2576283ac41144118e258fd52311 Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 16 Sep 2021 17:49:00 -0500 Subject: [PATCH 09/36] Update cmake.yml --- .github/workflows/cmake.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 8a498b4..64e2bd5 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -58,7 +58,9 @@ jobs: - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type - run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCURL_LIBRARY=./curl/lib/curl.lib -DCURL_INCLUDE_DIR=./curl/include -DJANSSON_LIBRARIES=./jansson.lib -DJANSSON_INCLUDE_DIRS=./ + run: | + dir + cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DJANSSON_LIBRARIES=./jansson.lib -DJANSSON_INCLUDE_DIRS=./ - name: Build # Build your program with the given configuration From f2ee300debf74ee0502cf12c02cb1a7c5dbeea26 Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 16 Sep 2021 17:55:27 -0500 Subject: [PATCH 10/36] Update cmake.yml --- .github/workflows/cmake.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 64e2bd5..dae5bc6 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -20,7 +20,9 @@ jobs: steps: - uses: actions/checkout@v2 - name: Install dependencies - run: sudo apt-get install libjansson-dev libcurl4-openssl-dev libreadline-dev + run: | + sudo apt-get update + sudo apt-get install libjansson-dev libcurl4-openssl-dev libreadline-dev - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. @@ -33,8 +35,6 @@ jobs: build-windows-x64: runs-on: windows-2019 - env: - CMAKE_FLAGS: "-A x64" steps: - uses: actions/checkout@v2 @@ -60,7 +60,7 @@ jobs: # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type run: | dir - cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DJANSSON_LIBRARIES=./jansson.lib -DJANSSON_INCLUDE_DIRS=./ + cmake -A x64 -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DJANSSON_LIBRARIES=./jansson.lib -DJANSSON_INCLUDE_DIRS=./ - name: Build # Build your program with the given configuration From f20a6e3a1edcf9968d59fdcea05f59b731ba88be Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 16 Sep 2021 18:00:30 -0500 Subject: [PATCH 11/36] Update CMakeLists.txt --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index b0665c0..bf4a2d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,6 +39,8 @@ source_group("Library Sources" FILES ${REDFISH_SRC}) if (WIN32) set(CURL_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/curl/include) set(CURL_LIBRARY ${CMAKE_CURRENT_SOURCE_DIR}/curl/lib/curl.lib) +set(JANSSON_LIBRARIES ${CMAKE_CURRENT_SOURCE_DIR}/jansson.lib) +set(JANSSON_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}) endif() find_package(CURL REQUIRED) From 85cbcb1045eea3e6e16be83d305259d89349afb7 Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 16 Sep 2021 18:14:48 -0500 Subject: [PATCH 12/36] Update cmake.yml --- .github/workflows/cmake.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index dae5bc6..5111137 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -38,6 +38,8 @@ jobs: steps: - uses: actions/checkout@v2 + - uses: olegtarasov/get-tag@v2.1 + id: tagName - name: Get Curl run: | @@ -66,3 +68,6 @@ jobs: # Build your program with the given configuration run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} + - name: Compress artifacts + run: Compress-Archive .\build\bin\Release\* -DestinationPath .\build\libredfish-${{ steps.tagName.outputs.tag }}-x64.zip + From 51740ae917bf13a4530bd427d24583435e1346bb Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 16 Sep 2021 18:18:17 -0500 Subject: [PATCH 13/36] Update cmake.yml --- .github/workflows/cmake.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 5111137..7c6aac4 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -60,9 +60,7 @@ jobs: - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type - run: | - dir - cmake -A x64 -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DJANSSON_LIBRARIES=./jansson.lib -DJANSSON_INCLUDE_DIRS=./ + run: cmake -A x64 -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DJANSSON_LIBRARIES=./jansson.lib -DJANSSON_INCLUDE_DIRS=./ - name: Build # Build your program with the given configuration @@ -71,3 +69,9 @@ jobs: - name: Compress artifacts run: Compress-Archive .\build\bin\Release\* -DestinationPath .\build\libredfish-${{ steps.tagName.outputs.tag }}-x64.zip + - name: Archive production artifacts + uses: actions/upload-artifact@v2 + with: + name: windows-x66 + path: ${{github.workspace}}\build\libredfish-${{ steps.tagName.outputs.tag }}-x64.zip + From f9e69c49e447a6dae247e323a811ebf654a7d270 Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 16 Sep 2021 18:28:48 -0500 Subject: [PATCH 14/36] Update cmake.yml --- .github/workflows/cmake.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 7c6aac4..60f35b2 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -19,6 +19,8 @@ jobs: steps: - uses: actions/checkout@v2 + - uses: olegtarasov/get-tag@v2.1 + id: tagName - name: Install dependencies run: | sudo apt-get update @@ -33,6 +35,21 @@ jobs: # Build your program with the given configuration run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} + - uses: jiro4989/build-deb-action@v2 + with: + package: libredfish + package_root: .debpkg + maintainer: Patrick_Boyd@Dell.com + version: ${{ steps.tagName.outputs.tag }} + arch: 'amd64' + desc: 'libRedfish is a C client library that allows for Creation of Entities (POST), Read of Entities (GET), Update of Entities (PATCH), Deletion of Entities (DELETE), running Actions (POST), receiving events, and providing some basic query abilities.' + + - uses: actions/upload-artifact@v2 + with: + name: ${{ matrix.os }} + path: ./*.deb + + build-windows-x64: runs-on: windows-2019 @@ -72,6 +89,6 @@ jobs: - name: Archive production artifacts uses: actions/upload-artifact@v2 with: - name: windows-x66 + name: windows-x64 path: ${{github.workspace}}\build\libredfish-${{ steps.tagName.outputs.tag }}-x64.zip From c5c8ff9004be36e54487e8885555dfc846d0102f Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 16 Sep 2021 18:39:35 -0500 Subject: [PATCH 15/36] Update cmake.yml --- .github/workflows/cmake.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 60f35b2..ff13511 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -9,6 +9,8 @@ on: env: # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) BUILD_TYPE: Release + #Default tag name + GIT_TAG_NAME: '0.0.1' jobs: build-ubuntu: @@ -21,6 +23,7 @@ jobs: - uses: actions/checkout@v2 - uses: olegtarasov/get-tag@v2.1 id: tagName + - name: Install dependencies run: | sudo apt-get update @@ -40,7 +43,7 @@ jobs: package: libredfish package_root: .debpkg maintainer: Patrick_Boyd@Dell.com - version: ${{ steps.tagName.outputs.tag }} + version: ${{ env.GIT_TAG_NAME }} arch: 'amd64' desc: 'libRedfish is a C client library that allows for Creation of Entities (POST), Read of Entities (GET), Update of Entities (PATCH), Deletion of Entities (DELETE), running Actions (POST), receiving events, and providing some basic query abilities.' @@ -84,11 +87,11 @@ jobs: run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} - name: Compress artifacts - run: Compress-Archive .\build\bin\Release\* -DestinationPath .\build\libredfish-${{ steps.tagName.outputs.tag }}-x64.zip + run: Compress-Archive .\build\bin\Release\* -DestinationPath .\build\libredfish-${{ env.GIT_TAG_NAME }}-x64.zip - name: Archive production artifacts uses: actions/upload-artifact@v2 with: name: windows-x64 - path: ${{github.workspace}}\build\libredfish-${{ steps.tagName.outputs.tag }}-x64.zip + path: ${{github.workspace}}\build\libredfish-${{ env.GIT_TAG_NAME }}-x64.zip From 76d8b75e1e5e559d9e160104069416eddb90d256 Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 16 Sep 2021 18:44:45 -0500 Subject: [PATCH 16/36] Update cmake.yml --- .github/workflows/cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index ff13511..73b8aa1 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -45,7 +45,7 @@ jobs: maintainer: Patrick_Boyd@Dell.com version: ${{ env.GIT_TAG_NAME }} arch: 'amd64' - desc: 'libRedfish is a C client library that allows for Creation of Entities (POST), Read of Entities (GET), Update of Entities (PATCH), Deletion of Entities (DELETE), running Actions (POST), receiving events, and providing some basic query abilities.' + desc: 'libredfish' - uses: actions/upload-artifact@v2 with: From 106a2fe84bed2fa81629923c1ac2cbd465bcb21d Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 16 Sep 2021 19:04:01 -0500 Subject: [PATCH 17/36] package-bin.yaml --- package-bin.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 package-bin.yaml diff --git a/package-bin.yaml b/package-bin.yaml new file mode 100644 index 0000000..e902690 --- /dev/null +++ b/package-bin.yaml @@ -0,0 +1,17 @@ +meta: + description: libredfish + vendor: DMTF + maintainer: Patrick_Boyd@Dell.com +files: + "/usr/lib64/libredfish.so": + file: build/lib/libredfish.so + mode: "0755" + user: "root" + "/usr/bin/redfishcli": + file: build/bin/redfishcli + mode: "0755" + user: "root" + "/usr/bin/redfishtool": + file: build/bin/redfishtool + mode: "0755" + user: "root" From f5439380ad5af51e28199f5c5a3ba875016a53e4 Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 16 Sep 2021 19:05:20 -0500 Subject: [PATCH 18/36] Update cmake.yml --- .github/workflows/cmake.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 73b8aa1..0858658 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -38,14 +38,13 @@ jobs: # Build your program with the given configuration run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} - - uses: jiro4989/build-deb-action@v2 + - uses: kentik/pkg@v1 with: - package: libredfish - package_root: .debpkg - maintainer: Patrick_Boyd@Dell.com + name: libredfish version: ${{ env.GIT_TAG_NAME }} - arch: 'amd64' - desc: 'libredfish' + arch: 'x86_64' + format: 'deb' + package: package.yaml - uses: actions/upload-artifact@v2 with: From f337f6315d20e3c81c707ae5833d49cac9b38ec5 Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 16 Sep 2021 19:09:49 -0500 Subject: [PATCH 19/36] Update cmake.yml --- .github/workflows/cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 0858658..d029c4a 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -38,7 +38,7 @@ jobs: # Build your program with the given configuration run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} - - uses: kentik/pkg@v1 + - uses: kentik/pkg@v1.0.0-rc7 with: name: libredfish version: ${{ env.GIT_TAG_NAME }} From 76f5d4f9cad8b393f008c1106979f44ead92cbc3 Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 16 Sep 2021 19:11:15 -0500 Subject: [PATCH 20/36] Update cmake.yml --- .github/workflows/cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index d029c4a..9413711 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -44,7 +44,7 @@ jobs: version: ${{ env.GIT_TAG_NAME }} arch: 'x86_64' format: 'deb' - package: package.yaml + package: package-bin.yaml - uses: actions/upload-artifact@v2 with: From 791b0f9f3ca7351cc22ded371d39c0d46e48392a Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 16 Sep 2021 19:28:13 -0500 Subject: [PATCH 21/36] Update package-bin.yaml --- package-bin.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-bin.yaml b/package-bin.yaml index e902690..362dcd9 100644 --- a/package-bin.yaml +++ b/package-bin.yaml @@ -11,7 +11,7 @@ files: file: build/bin/redfishcli mode: "0755" user: "root" - "/usr/bin/redfishtool": - file: build/bin/redfishtool + "/usr/bin/redfishtest": + file: build/bin/redfishtest mode: "0755" user: "root" From 9e052853b8ce65526787279269d84f1b6ab2c380 Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 16 Sep 2021 19:52:15 -0500 Subject: [PATCH 22/36] Create package-dev.yaml --- package-dev.yaml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package-dev.yaml diff --git a/package-dev.yaml b/package-dev.yaml new file mode 100644 index 0000000..a9e1a94 --- /dev/null +++ b/package-dev.yaml @@ -0,0 +1,37 @@ +meta: + description: libredfish-dev + vendor: DMTF + maintainer: Patrick_Boyd@Dell.com +files: + "/usr/include/libredfish/redfish.h": + file: include/redfish.h + mode: "0644" + user: "root" + "/usr/include/libredfish/redfishEvent.h": + file: include/redfishEvent.h + mode: "0644" + user: "root" + "/usr/include/libredfish/redfishPayload.h": + file: include/redfishPayload.h + mode: "0644" + user: "root" + "/usr/include/libredfish/redfishRawAsync.h": + file: include/redfishRawAsync.h + mode: "0644" + user: "root" + "/usr/include/libredfish/redfishService.h": + file: include/redfishService.h + mode: "0644" + user: "root" + "/usr/include/libredfish/redpath.h": + file: include/redpath.h + mode: "0644" + user: "root" + "/usr/include/libredfish/entities/chassis.h": + file: include/entities/chassis.h + mode: "0644" + user: "root" + "/usr/include/libredfish/entities/resource.h": + file: include/entities/resource.h + mode: "0644" + user: "root" From 7a857a03ff1f57b0c92e097540f56b737ea8f4f6 Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 16 Sep 2021 19:52:50 -0500 Subject: [PATCH 23/36] Update cmake.yml --- .github/workflows/cmake.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 9413711..cf08d84 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -46,6 +46,14 @@ jobs: format: 'deb' package: package-bin.yaml + - uses: kentik/pkg@v1.0.0-rc7 + with: + name: libredfish-dev + version: ${{ env.GIT_TAG_NAME }} + arch: 'x86_64' + format: 'deb' + package: package-dev.yaml + - uses: actions/upload-artifact@v2 with: name: ${{ matrix.os }} From 486fa6845dd12cef9549e786d4b6adbbd1707e2b Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 16 Sep 2021 19:59:25 -0500 Subject: [PATCH 24/36] Update cmake.yml --- .github/workflows/cmake.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index cf08d84..d4fbcdf 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -53,12 +53,23 @@ jobs: arch: 'x86_64' format: 'deb' package: package-dev.yaml + + - name: build RPM package + id: rpm_build + uses: naveenrajm7/rpmbuild@master + with: + spec_file: "rpm/libredfish.spec" - uses: actions/upload-artifact@v2 with: name: ${{ matrix.os }} path: ./*.deb + - uses: actions/upload-artifact@v2 + with: + name: RPM + path: ./*.rpm + build-windows-x64: runs-on: windows-2019 From 848dbfb4f466ce56b29b1a7954b505cf11a6088b Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 16 Sep 2021 20:05:48 -0500 Subject: [PATCH 25/36] Update cmake.yml --- .github/workflows/cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index d4fbcdf..b640a4e 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -58,7 +58,7 @@ jobs: id: rpm_build uses: naveenrajm7/rpmbuild@master with: - spec_file: "rpm/libredfish.spec" + spec_file: "libredfish.spec" - uses: actions/upload-artifact@v2 with: From 8d9646efb1af304e1e5f702fb3cc1b0099752275 Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 16 Sep 2021 20:09:21 -0500 Subject: [PATCH 26/36] Update cmake.yml --- .github/workflows/cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index b640a4e..2082026 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -58,7 +58,7 @@ jobs: id: rpm_build uses: naveenrajm7/rpmbuild@master with: - spec_file: "libredfish.spec" + spec_file: rpm/libredfish.spec - uses: actions/upload-artifact@v2 with: From c3266e62d0e550bd29e01ea2d933c6dcebe8f7cf Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 16 Sep 2021 20:23:32 -0500 Subject: [PATCH 27/36] Disable RPM build for now --- .github/workflows/cmake.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 2082026..92702dd 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -54,21 +54,21 @@ jobs: format: 'deb' package: package-dev.yaml - - name: build RPM package - id: rpm_build - uses: naveenrajm7/rpmbuild@master - with: - spec_file: rpm/libredfish.spec +# - name: build RPM package +# id: rpm_build +# uses: naveenrajm7/rpmbuild@master +# with: +# spec_file: rpm/libredfish.spec - uses: actions/upload-artifact@v2 with: name: ${{ matrix.os }} path: ./*.deb - - uses: actions/upload-artifact@v2 - with: - name: RPM - path: ./*.rpm +# - uses: actions/upload-artifact@v2 +# with: +# name: RPM +# path: ./*.rpm build-windows-x64: From 699b91c049dfd4389c2c0aaa9cdcfe4234d826e9 Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 16 Sep 2021 20:27:43 -0500 Subject: [PATCH 28/36] Rename cmake.yml to pull.yml --- .github/workflows/{cmake.yml => pull.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{cmake.yml => pull.yml} (100%) diff --git a/.github/workflows/cmake.yml b/.github/workflows/pull.yml similarity index 100% rename from .github/workflows/cmake.yml rename to .github/workflows/pull.yml From a1e607fb3913acfe2f3d8f0b178713c0b6794b35 Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 16 Sep 2021 20:28:02 -0500 Subject: [PATCH 29/36] Update pull.yml --- .github/workflows/pull.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index 92702dd..1016b3f 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -1,4 +1,4 @@ -name: CMake +name: Pull Test on: push: From 01fef8d5f8688256df069b11a52630408319e7ed Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 16 Sep 2021 20:34:33 -0500 Subject: [PATCH 30/36] Create release.yml --- .github/workflows/release.yml | 107 ++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..e0a66cb --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,107 @@ +name: Release + +on: + release: + types: [ published ] + +env: + # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) + BUILD_TYPE: Release + +jobs: + build-ubuntu: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-18.04, ubuntu-20.04] + + steps: + - uses: actions/checkout@v2 + - uses: olegtarasov/get-tag@v2.1 + id: tagName + + - name: Install dependencies + run: | + sudo apt-get update + sudo apt-get install libjansson-dev libcurl4-openssl-dev libreadline-dev + + - name: Configure CMake + # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. + # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type + run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} + + - name: Build + # Build your program with the given configuration + run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} + + - uses: kentik/pkg@v1.0.0-rc7 + with: + name: libredfish-${{ matrix.os }} + version: ${{ env.GIT_TAG_NAME }} + arch: 'x86_64' + format: 'deb' + package: package-bin.yaml + + - uses: kentik/pkg@v1.0.0-rc7 + with: + name: libredfish-dev-${{ matrix.os }} + version: ${{ env.GIT_TAG_NAME }} + arch: 'x86_64' + format: 'deb' + package: package-dev.yaml + +# - name: build RPM package +# id: rpm_build +# uses: naveenrajm7/rpmbuild@master +# with: +# spec_file: rpm/libredfish.spec + + - uses: softprops/action-gh-release@v1 + with: + files: ./*.deb + +# - uses: softprops/action-gh-release@v1 +# with: +# files: ./*.rpm + + + build-windows-x64: + runs-on: windows-2019 + + steps: + - uses: actions/checkout@v2 + - uses: olegtarasov/get-tag@v2.1 + id: tagName + + - name: Get Curl + run: | + Invoke-WebRequest -Uri https://curl.se/windows/dl-7.76.1/curl-7.76.1-win64-mingw.zip -OutFile curl.zip + Expand-Archive curl.zip + Move-Item .\curl\*\* .\curl\ + Copy-Item .\curl\lib\libcurl.dll.a .\curl\lib\curl.lib + + - name: Get Jansson + run: | + Invoke-WebRequest -OutFile jansson.lib -Uri https://github.com/pboyd04/jansson/releases/download/v2.11/janssonx64.lib + Invoke-WebRequest -OutFile include/jansson.h -Uri https://github.com/pboyd04/jansson/releases/download/v2.11/jansson.h + Invoke-WebRequest -OutFile include/jansson_config.h -Uri https://github.com/pboyd04/jansson/releases/download/v2.11/jansson_config.h + + - name: Get getopt.h + run: Invoke-WebRequest -OutFile include/getopt.h -Uri https://raw.githubusercontent.com/skandhurkat/Getopt-for-Visual-Studio/master/getopt.h + + - name: Configure CMake + # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. + # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type + run: cmake -A x64 -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DJANSSON_LIBRARIES=./jansson.lib -DJANSSON_INCLUDE_DIRS=./ + + - name: Build + # Build your program with the given configuration + run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} + + - name: Compress artifacts + run: Compress-Archive .\build\bin\Release\* -DestinationPath .\build\libredfish-${{ env.GIT_TAG_NAME }}-x64.zip + + - name: Archive production artifacts + uses: softprops/action-gh-release@v1 + with: + files: ${{github.workspace}}\build\libredfish-${{ env.GIT_TAG_NAME }}-x64.zip From 2cf4c030c32c3e368bb351c4566629ade487d2dd Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 27 Jul 2023 10:30:58 -0500 Subject: [PATCH 31/36] Create build.yml --- .github/workflows/build.yml | 107 ++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..e0a66cb --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,107 @@ +name: Release + +on: + release: + types: [ published ] + +env: + # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) + BUILD_TYPE: Release + +jobs: + build-ubuntu: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-18.04, ubuntu-20.04] + + steps: + - uses: actions/checkout@v2 + - uses: olegtarasov/get-tag@v2.1 + id: tagName + + - name: Install dependencies + run: | + sudo apt-get update + sudo apt-get install libjansson-dev libcurl4-openssl-dev libreadline-dev + + - name: Configure CMake + # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. + # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type + run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} + + - name: Build + # Build your program with the given configuration + run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} + + - uses: kentik/pkg@v1.0.0-rc7 + with: + name: libredfish-${{ matrix.os }} + version: ${{ env.GIT_TAG_NAME }} + arch: 'x86_64' + format: 'deb' + package: package-bin.yaml + + - uses: kentik/pkg@v1.0.0-rc7 + with: + name: libredfish-dev-${{ matrix.os }} + version: ${{ env.GIT_TAG_NAME }} + arch: 'x86_64' + format: 'deb' + package: package-dev.yaml + +# - name: build RPM package +# id: rpm_build +# uses: naveenrajm7/rpmbuild@master +# with: +# spec_file: rpm/libredfish.spec + + - uses: softprops/action-gh-release@v1 + with: + files: ./*.deb + +# - uses: softprops/action-gh-release@v1 +# with: +# files: ./*.rpm + + + build-windows-x64: + runs-on: windows-2019 + + steps: + - uses: actions/checkout@v2 + - uses: olegtarasov/get-tag@v2.1 + id: tagName + + - name: Get Curl + run: | + Invoke-WebRequest -Uri https://curl.se/windows/dl-7.76.1/curl-7.76.1-win64-mingw.zip -OutFile curl.zip + Expand-Archive curl.zip + Move-Item .\curl\*\* .\curl\ + Copy-Item .\curl\lib\libcurl.dll.a .\curl\lib\curl.lib + + - name: Get Jansson + run: | + Invoke-WebRequest -OutFile jansson.lib -Uri https://github.com/pboyd04/jansson/releases/download/v2.11/janssonx64.lib + Invoke-WebRequest -OutFile include/jansson.h -Uri https://github.com/pboyd04/jansson/releases/download/v2.11/jansson.h + Invoke-WebRequest -OutFile include/jansson_config.h -Uri https://github.com/pboyd04/jansson/releases/download/v2.11/jansson_config.h + + - name: Get getopt.h + run: Invoke-WebRequest -OutFile include/getopt.h -Uri https://raw.githubusercontent.com/skandhurkat/Getopt-for-Visual-Studio/master/getopt.h + + - name: Configure CMake + # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. + # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type + run: cmake -A x64 -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DJANSSON_LIBRARIES=./jansson.lib -DJANSSON_INCLUDE_DIRS=./ + + - name: Build + # Build your program with the given configuration + run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} + + - name: Compress artifacts + run: Compress-Archive .\build\bin\Release\* -DestinationPath .\build\libredfish-${{ env.GIT_TAG_NAME }}-x64.zip + + - name: Archive production artifacts + uses: softprops/action-gh-release@v1 + with: + files: ${{github.workspace}}\build\libredfish-${{ env.GIT_TAG_NAME }}-x64.zip From 1d5905ead3bdd513b9fb1e98f648565eeee9426e Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 27 Jul 2023 10:32:17 -0500 Subject: [PATCH 32/36] Update build.yml --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e0a66cb..a6863cd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,6 +1,10 @@ name: Release on: + push: + branches: [master] + pull_request: + branches: [master] release: types: [ published ] From 6b3c539c1c1e62e5a0ce75a50495cdeb4429372c Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 27 Jul 2023 10:34:05 -0500 Subject: [PATCH 33/36] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a6863cd..746aaf9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,9 +2,9 @@ name: Release on: push: - branches: [master] + branches: [main] pull_request: - branches: [master] + branches: [main] release: types: [ published ] From 0a36df215cacaa033c5737d959a0bc2deb26e936 Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 27 Jul 2023 10:44:00 -0500 Subject: [PATCH 34/36] Update build.yml --- .github/workflows/build.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 746aaf9..6926043 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Release +name: Build on: push: @@ -17,7 +17,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-18.04, ubuntu-20.04] + os: [ubuntu-20.04, ubuntu-latest] steps: - uses: actions/checkout@v2 @@ -47,6 +47,7 @@ jobs: package: package-bin.yaml - uses: kentik/pkg@v1.0.0-rc7 + if: ${{ github.event_name == 'release' }} with: name: libredfish-dev-${{ matrix.os }} version: ${{ env.GIT_TAG_NAME }} @@ -70,7 +71,7 @@ jobs: build-windows-x64: - runs-on: windows-2019 + runs-on: windows-latest steps: - uses: actions/checkout@v2 @@ -79,7 +80,7 @@ jobs: - name: Get Curl run: | - Invoke-WebRequest -Uri https://curl.se/windows/dl-7.76.1/curl-7.76.1-win64-mingw.zip -OutFile curl.zip + Invoke-WebRequest -Uri https://curl.se/windows/latest.cgi?p=win64-mingw.zip -OutFile curl.zip Expand-Archive curl.zip Move-Item .\curl\*\* .\curl\ Copy-Item .\curl\lib\libcurl.dll.a .\curl\lib\curl.lib From badd26fc6b27d5c0f04b2a025520b17c685b2f8f Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 27 Jul 2023 10:59:38 -0500 Subject: [PATCH 35/36] Update build.yml --- .github/workflows/build.yml | 59 +++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6926043..edc534e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,6 +39,7 @@ jobs: run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} - uses: kentik/pkg@v1.0.0-rc7 + if: ${{ github.event_name == 'release' }} with: name: libredfish-${{ matrix.os }} version: ${{ env.GIT_TAG_NAME }} @@ -70,43 +71,43 @@ jobs: # files: ./*.rpm - build-windows-x64: - runs-on: windows-latest +# build-windows-x64: +# runs-on: windows-latest - steps: - - uses: actions/checkout@v2 - - uses: olegtarasov/get-tag@v2.1 - id: tagName +# steps: +# - uses: actions/checkout@v2 +# - uses: olegtarasov/get-tag@v2.1 +# id: tagName - - name: Get Curl - run: | - Invoke-WebRequest -Uri https://curl.se/windows/latest.cgi?p=win64-mingw.zip -OutFile curl.zip - Expand-Archive curl.zip - Move-Item .\curl\*\* .\curl\ - Copy-Item .\curl\lib\libcurl.dll.a .\curl\lib\curl.lib +# - name: Get Curl +# run: | +# Invoke-WebRequest -Uri https://curl.se/windows/latest.cgi?p=win64-mingw.zip -OutFile curl.zip +# Expand-Archive curl.zip +# Move-Item .\curl\*\* .\curl\ +# Copy-Item .\curl\lib\libcurl.dll.a .\curl\lib\curl.lib - - name: Get Jansson - run: | - Invoke-WebRequest -OutFile jansson.lib -Uri https://github.com/pboyd04/jansson/releases/download/v2.11/janssonx64.lib - Invoke-WebRequest -OutFile include/jansson.h -Uri https://github.com/pboyd04/jansson/releases/download/v2.11/jansson.h - Invoke-WebRequest -OutFile include/jansson_config.h -Uri https://github.com/pboyd04/jansson/releases/download/v2.11/jansson_config.h +# - name: Get Jansson +# run: | +# Invoke-WebRequest -OutFile jansson.lib -Uri https://github.com/pboyd04/jansson/releases/download/v2.11/janssonx64.lib +# Invoke-WebRequest -OutFile include/jansson.h -Uri https://github.com/pboyd04/jansson/releases/download/v2.11/jansson.h +# Invoke-WebRequest -OutFile include/jansson_config.h -Uri https://github.com/pboyd04/jansson/releases/download/v2.11/jansson_config.h - - name: Get getopt.h - run: Invoke-WebRequest -OutFile include/getopt.h -Uri https://raw.githubusercontent.com/skandhurkat/Getopt-for-Visual-Studio/master/getopt.h +# - name: Get getopt.h +# run: Invoke-WebRequest -OutFile include/getopt.h -Uri https://raw.githubusercontent.com/skandhurkat/Getopt-for-Visual-Studio/master/getopt.h - - name: Configure CMake +# - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type - run: cmake -A x64 -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DJANSSON_LIBRARIES=./jansson.lib -DJANSSON_INCLUDE_DIRS=./ +# run: cmake -A x64 -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DJANSSON_LIBRARIES=./jansson.lib -DJANSSON_INCLUDE_DIRS=./ - - name: Build +# - name: Build # Build your program with the given configuration - run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} +# run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} - - name: Compress artifacts - run: Compress-Archive .\build\bin\Release\* -DestinationPath .\build\libredfish-${{ env.GIT_TAG_NAME }}-x64.zip +# - name: Compress artifacts +# run: Compress-Archive .\build\bin\Release\* -DestinationPath .\build\libredfish-${{ env.GIT_TAG_NAME }}-x64.zip - - name: Archive production artifacts - uses: softprops/action-gh-release@v1 - with: - files: ${{github.workspace}}\build\libredfish-${{ env.GIT_TAG_NAME }}-x64.zip +# - name: Archive production artifacts +# uses: softprops/action-gh-release@v1 +# with: +# files: ${{github.workspace}}\build\libredfish-${{ env.GIT_TAG_NAME }}-x64.zip From c9e653b995ca566009803e6c4abf7eff51080519 Mon Sep 17 00:00:00 2001 From: Patrick Boyd Date: Thu, 27 Jul 2023 11:01:21 -0500 Subject: [PATCH 36/36] Update build.yml --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index edc534e..c6b532a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -63,6 +63,7 @@ jobs: # spec_file: rpm/libredfish.spec - uses: softprops/action-gh-release@v1 + if: ${{ github.event_name == 'release' }} with: files: ./*.deb