From 7ad7bc7f15c52e786a95686a6613ad8782811c55 Mon Sep 17 00:00:00 2001 From: Dwi Nugroho Date: Fri, 30 Jun 2023 12:03:57 +0200 Subject: [PATCH 1/6] added Dockerfile for RockyLinux --- docker/Dockerfile-rocky-8.7 | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 docker/Dockerfile-rocky-8.7 diff --git a/docker/Dockerfile-rocky-8.7 b/docker/Dockerfile-rocky-8.7 new file mode 100644 index 0000000..90ecd0f --- /dev/null +++ b/docker/Dockerfile-rocky-8.7 @@ -0,0 +1,30 @@ +FROM rockylinux:8.7 + +RUN dnf update -y && dnf install -y \ + git \ + wget \ + python2 \ + epel-release \ + tar \ + cmake \ + curl zip unzip tar \ + pkg-config \ + autoconf \ + cmake \ + flex \ + bison \ + man-pages + +RUN dnf install -y \ + p7zip \ + p7zip-plugins\ + python3 \ + python3-virtualenv + +RUN dnf --enablerepo=powertools -y install ninja-build + +RUN dnf groupinstall -y "Development Tools" + +ADD ./entrypoint-build.sh /entrypoint.sh + +ENTRYPOINT ["/entrypoint.sh"] \ No newline at end of file From edbe1811a8fca08e2db9665a58512f51fb235304 Mon Sep 17 00:00:00 2001 From: Dwi Nugroho Date: Wed, 26 Jul 2023 11:19:18 +0200 Subject: [PATCH 2/6] added rocky to GitHub action --- .github/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4665e9d..1370dd1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,6 +29,9 @@ jobs: - osversion: ubuntu-22.04 arch: "arm64" force_system_binary: 1 + - osversion: rocky-8.7 + arch: "arm64" + force_system_binary: 1 env: VCPKG_DEP_LIST: ${{ matrix.arch }}-linux VCPKG_FORCE_SYSTEM_BINARIES: ${{ matrix.force_system_binary }} @@ -38,7 +41,7 @@ jobs: with: submodules: true fetch-depth: 0 - - name: Checkout vcokg submodules + - name: Checkout vcpkg submodules working-directory: ${{ github.workspace }}/vcpkg/ run: git fetch --unshallow || true - name: Set output vars to the actual tag name From 038b6f91ecf389994e3adc8514d4d228e95b97e4 Mon Sep 17 00:00:00 2001 From: Dwi Nugroho Date: Thu, 27 Jul 2023 15:15:46 +0200 Subject: [PATCH 3/6] #38: run rocky only #38: also disable osx #38: comment out osx #38: update to cmake 3.21 #38: reorder install sequence #38: added openssl #38: use pre-build cmake #38: remove preceeding dot #38: build cmake #38: remove another preceeding dot --- .github/workflows/build.yml | 162 ++++++++++++++++++------------------ docker/Dockerfile-rocky-8.7 | 14 +++- 2 files changed, 94 insertions(+), 82 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1370dd1..b7414eb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,21 +14,21 @@ jobs: fail-fast: false matrix: include: - - osversion: ubuntu-18.04 - arch: "x64" - force_system_binary: 0 - - osversion: ubuntu-20.04 - arch: "x64" - force_system_binary: 0 +# - osversion: ubuntu-18.04 +# arch: "x64" +# force_system_binary: 0 +# - osversion: ubuntu-20.04 +# arch: "x64" +# force_system_binary: 0 - osversion: ubuntu-22.04 arch: "x64" force_system_binary: 0 - - osversion: ubuntu-20.04 - arch: "arm64" - force_system_binary: 1 - - osversion: ubuntu-22.04 - arch: "arm64" - force_system_binary: 1 +# - osversion: ubuntu-20.04 +# arch: "arm64" +# force_system_binary: 1 +# - osversion: ubuntu-22.04 +# arch: "arm64" +# force_system_binary: 1 - osversion: rocky-8.7 arch: "arm64" force_system_binary: 1 @@ -54,13 +54,13 @@ jobs: - name: Install vcpkg id: bootstrapvcpkg run: | - docker run -e ARCH=${{ matrix.arch }} -v ${{ github.workspace }}:/build_dir --rm nes_dep_build_${{ matrix.osversion }} ./build_dir/vcpkg/bootstrap-vcpkg.sh -disableMetrics + docker run -e ARCH=${{ matrix.arch }} -v ${{ github.workspace }}:/build_dir --rm nes_dep_build_${{ matrix.osversion }} /build_dir/vcpkg/bootstrap-vcpkg.sh -disableMetrics shell: bash - name: Install dependencies in manifest mode id: installdeps run: | docker run -e ARCH=${{ matrix.arch }} -v ${{ github.workspace }}:/build_dir --rm nes_dep_build_${{ matrix.osversion }} \ - ./build_dir/vcpkg/vcpkg install --triplet=${{ env.VCPKG_DEP_LIST }}-nes \ + /build_dir/vcpkg/vcpkg install --triplet=${{ env.VCPKG_DEP_LIST }}-nes \ --host-triplet=${{ env.VCPKG_DEP_LIST }}-nes --overlay-triplets=/build_dir/custom-triplets/ --x-manifest-root=/build_dir/ --overlay-ports=/build_dir/vcpkg-registry/ports - name: Compress artifacts id: compressdeps @@ -98,70 +98,70 @@ jobs: test -n "$(docker image ls -q nes_dep_build_${{ matrix.osversion }})" && \ docker image rm $(docker image ls -q nes_dep_build_${{ matrix.osversion }}) || \ true - build-osx: - timeout-minutes: 360 - name: osx ${{ matrix.arch }} - runs-on: [self-hosted, macOS, '${{ matrix.arch }}'] - strategy: - fail-fast: false - matrix: - include: - - arch: "x64" - - arch: "arm64" - env: - VCPKG_DEP_LIST: ${{ matrix.arch }}-osx - VCPKG_FEATURE_FLAGS: -binarycaching - steps: - - uses: lukka/get-cmake@latest - - uses: actions/checkout@v3 - with: - submodules: true - fetch-depth: 0 - - name: Checkout vcokg submodules - working-directory: ${{ github.workspace }}/vcpkg/ - run: git fetch --unshallow || true - - uses: actions/setup-python@v4 - with: - python-version: "3.11" - architecture: x64 - - name: Set output vars to the actual tag name - id: vars - run: echo ::set-output name=tag::${GITHUB_REF#refs/*/} - - name: Install vcpkg - id: bootstrapvcpkg - run: | - ${{ github.workspace }}/vcpkg/bootstrap-vcpkg.sh -disableMetrics - shell: bash - - name: Install dependencies in manifest mode - id: installdeps - run: | - ${{ github.workspace }}/vcpkg/vcpkg install --triplet=${{ env.VCPKG_DEP_LIST }}-nes --host-triplet=${{ env.VCPKG_DEP_LIST }}-nes --overlay-triplets=custom-triplets/ --overlay-ports=vcpkg-registry/ports - - name: Compress artifacts - id: compressdeps - run: | - mkdir nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes && \ - mv ${{ github.workspace }}/vcpkg_installed nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/installed && \ - mkdir -p nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/scripts/buildsystems && \ - cp ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake ${{ github.workspace }}/nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/scripts/buildsystems/ && \ - touch ${{ github.workspace }}/nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/.vcpkg-root && \ - 7z a nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes.7z nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes -mx9 -aoa - - name: Release - uses: softprops/action-gh-release@v1 - id: createrelease - with: - files: | - nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes.7z - - name: Upload GitHub Actions artifact of vcpkg build logs - uses: actions/upload-artifact@v2 - if: failure() - id: uploadlogs - with: - name: vcpkg-logs-${{ env.VCPKG_DEP_LIST }} - path: ${{ github.workspace }}/vcpkg/buildtrees/**/*.log - - name: Clean build artifacts - id: cleanbuildartifacts - if: always() - run: | - rm -rf nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes \ - nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-${{ matrix.osversion }}-nes.7z \ - ${{ github.workspace }}/vcpkg/{buildtrees,downloads,packages} \ No newline at end of file +# build-osx: +# timeout-minutes: 360 +# name: osx ${{ matrix.arch }} +# runs-on: [self-hosted, macOS, '${{ matrix.arch }}'] +# strategy: +# fail-fast: false +# matrix: +# include: +# - arch: "x64" +# - arch: "arm64" +# env: +# VCPKG_DEP_LIST: ${{ matrix.arch }}-osx +# VCPKG_FEATURE_FLAGS: -binarycaching +# steps: +# - uses: lukka/get-cmake@latest +# - uses: actions/checkout@v3 +# with: +# submodules: true +# fetch-depth: 0 +# - name: Checkout vcokg submodules +# working-directory: ${{ github.workspace }}/vcpkg/ +# run: git fetch --unshallow || true +# - uses: actions/setup-python@v4 +# with: +# python-version: "3.11" +# architecture: x64 +# - name: Set output vars to the actual tag name +# id: vars +# run: echo ::set-output name=tag::${GITHUB_REF#refs/*/} +# - name: Install vcpkg +# id: bootstrapvcpkg +# run: | +# ${{ github.workspace }}/vcpkg/bootstrap-vcpkg.sh -disableMetrics +# shell: bash +# - name: Install dependencies in manifest mode +# id: installdeps +# run: | +# ${{ github.workspace }}/vcpkg/vcpkg install --triplet=${{ env.VCPKG_DEP_LIST }}-nes --host-triplet=${{ env.VCPKG_DEP_LIST }}-nes --overlay-triplets=custom-triplets/ --overlay-ports=vcpkg-registry/ports +# - name: Compress artifacts +# id: compressdeps +# run: | +# mkdir nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes && \ +# mv ${{ github.workspace }}/vcpkg_installed nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/installed && \ +# mkdir -p nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/scripts/buildsystems && \ +# cp ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake ${{ github.workspace }}/nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/scripts/buildsystems/ && \ +# touch ${{ github.workspace }}/nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/.vcpkg-root && \ +# 7z a nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes.7z nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes -mx9 -aoa +# - name: Release +# uses: softprops/action-gh-release@v1 +# id: createrelease +# with: +# files: | +# nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes.7z +# - name: Upload GitHub Actions artifact of vcpkg build logs +# uses: actions/upload-artifact@v2 +# if: failure() +# id: uploadlogs +# with: +# name: vcpkg-logs-${{ env.VCPKG_DEP_LIST }} +# path: ${{ github.workspace }}/vcpkg/buildtrees/**/*.log +# - name: Clean build artifacts +# id: cleanbuildartifacts +# if: always() +# run: | +# rm -rf nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes \ +# nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-${{ matrix.osversion }}-nes.7z \ +# ${{ github.workspace }}/vcpkg/{buildtrees,downloads,packages} \ No newline at end of file diff --git a/docker/Dockerfile-rocky-8.7 b/docker/Dockerfile-rocky-8.7 index 90ecd0f..4f43d53 100644 --- a/docker/Dockerfile-rocky-8.7 +++ b/docker/Dockerfile-rocky-8.7 @@ -6,12 +6,12 @@ RUN dnf update -y && dnf install -y \ python2 \ epel-release \ tar \ - cmake \ curl zip unzip tar \ pkg-config \ autoconf \ cmake \ flex \ + openssl-devel \ bison \ man-pages @@ -21,6 +21,18 @@ RUN dnf install -y \ python3 \ python3-virtualenv +WORKDIR /tmp + +RUN wget https://github.com/Kitware/CMake/releases/download/v3.21.0/cmake-3.21.0.tar.gz \ + && tar -xzf cmake-3.21.0.tar.gz \ + && cd cmake-3.21.0 \ + && dnf -y install gcc-c++ make \ + && ./bootstrap \ + && make \ + && make install + +WORKDIR /root + RUN dnf --enablerepo=powertools -y install ninja-build RUN dnf groupinstall -y "Development Tools" From bb006cb360e57c053c38782a62ceae65b7f326c3 Mon Sep 17 00:00:00 2001 From: Dwi Nugroho Date: Thu, 27 Jul 2023 16:25:30 +0200 Subject: [PATCH 4/6] #38: try to disable jemalloc docs --- vcpkg-registry/ports/jemalloc-nes/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcpkg-registry/ports/jemalloc-nes/portfile.cmake b/vcpkg-registry/ports/jemalloc-nes/portfile.cmake index 7b02210..36d3b0c 100644 --- a/vcpkg-registry/ports/jemalloc-nes/portfile.cmake +++ b/vcpkg-registry/ports/jemalloc-nes/portfile.cmake @@ -13,7 +13,7 @@ vcpkg_extract_source_archive_ex( ARCHIVE ${ARCHIVE} ) -list(APPEND OPTIONS --disable-stats) +list(APPEND OPTIONS --disable-stats --disable-doc) if(VCPKG_TARGET_IS_OSX) list(APPEND OPTIONS --with-lg-vaddr=48) endif() From 76e6c6dd185dc2143ef2ddebc935aa49640fecce Mon Sep 17 00:00:00 2001 From: Dwi Nugroho Date: Thu, 27 Jul 2023 17:23:11 +0200 Subject: [PATCH 5/6] #38: re-enable other builds --- .github/workflows/build.yml | 158 ++++++++++++++++++------------------ 1 file changed, 79 insertions(+), 79 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b7414eb..089956b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,21 +14,21 @@ jobs: fail-fast: false matrix: include: -# - osversion: ubuntu-18.04 -# arch: "x64" -# force_system_binary: 0 -# - osversion: ubuntu-20.04 -# arch: "x64" -# force_system_binary: 0 + - osversion: ubuntu-18.04 + arch: "x64" + force_system_binary: 0 + - osversion: ubuntu-20.04 + arch: "x64" + force_system_binary: 0 - osversion: ubuntu-22.04 arch: "x64" force_system_binary: 0 -# - osversion: ubuntu-20.04 -# arch: "arm64" -# force_system_binary: 1 -# - osversion: ubuntu-22.04 -# arch: "arm64" -# force_system_binary: 1 + - osversion: ubuntu-20.04 + arch: "arm64" + force_system_binary: 1 + - osversion: ubuntu-22.04 + arch: "arm64" + force_system_binary: 1 - osversion: rocky-8.7 arch: "arm64" force_system_binary: 1 @@ -98,70 +98,70 @@ jobs: test -n "$(docker image ls -q nes_dep_build_${{ matrix.osversion }})" && \ docker image rm $(docker image ls -q nes_dep_build_${{ matrix.osversion }}) || \ true -# build-osx: -# timeout-minutes: 360 -# name: osx ${{ matrix.arch }} -# runs-on: [self-hosted, macOS, '${{ matrix.arch }}'] -# strategy: -# fail-fast: false -# matrix: -# include: -# - arch: "x64" -# - arch: "arm64" -# env: -# VCPKG_DEP_LIST: ${{ matrix.arch }}-osx -# VCPKG_FEATURE_FLAGS: -binarycaching -# steps: -# - uses: lukka/get-cmake@latest -# - uses: actions/checkout@v3 -# with: -# submodules: true -# fetch-depth: 0 -# - name: Checkout vcokg submodules -# working-directory: ${{ github.workspace }}/vcpkg/ -# run: git fetch --unshallow || true -# - uses: actions/setup-python@v4 -# with: -# python-version: "3.11" -# architecture: x64 -# - name: Set output vars to the actual tag name -# id: vars -# run: echo ::set-output name=tag::${GITHUB_REF#refs/*/} -# - name: Install vcpkg -# id: bootstrapvcpkg -# run: | -# ${{ github.workspace }}/vcpkg/bootstrap-vcpkg.sh -disableMetrics -# shell: bash -# - name: Install dependencies in manifest mode -# id: installdeps -# run: | -# ${{ github.workspace }}/vcpkg/vcpkg install --triplet=${{ env.VCPKG_DEP_LIST }}-nes --host-triplet=${{ env.VCPKG_DEP_LIST }}-nes --overlay-triplets=custom-triplets/ --overlay-ports=vcpkg-registry/ports -# - name: Compress artifacts -# id: compressdeps -# run: | -# mkdir nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes && \ -# mv ${{ github.workspace }}/vcpkg_installed nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/installed && \ -# mkdir -p nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/scripts/buildsystems && \ -# cp ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake ${{ github.workspace }}/nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/scripts/buildsystems/ && \ -# touch ${{ github.workspace }}/nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/.vcpkg-root && \ -# 7z a nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes.7z nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes -mx9 -aoa -# - name: Release -# uses: softprops/action-gh-release@v1 -# id: createrelease -# with: -# files: | -# nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes.7z -# - name: Upload GitHub Actions artifact of vcpkg build logs -# uses: actions/upload-artifact@v2 -# if: failure() -# id: uploadlogs -# with: -# name: vcpkg-logs-${{ env.VCPKG_DEP_LIST }} -# path: ${{ github.workspace }}/vcpkg/buildtrees/**/*.log -# - name: Clean build artifacts -# id: cleanbuildartifacts -# if: always() -# run: | -# rm -rf nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes \ -# nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-${{ matrix.osversion }}-nes.7z \ -# ${{ github.workspace }}/vcpkg/{buildtrees,downloads,packages} \ No newline at end of file + build-osx: + timeout-minutes: 360 + name: osx ${{ matrix.arch }} + runs-on: [self-hosted, macOS, '${{ matrix.arch }}'] + strategy: + fail-fast: false + matrix: + include: + - arch: "x64" + - arch: "arm64" + env: + VCPKG_DEP_LIST: ${{ matrix.arch }}-osx + VCPKG_FEATURE_FLAGS: -binarycaching + steps: + - uses: lukka/get-cmake@latest + - uses: actions/checkout@v3 + with: + submodules: true + fetch-depth: 0 + - name: Checkout vcokg submodules + working-directory: ${{ github.workspace }}/vcpkg/ + run: git fetch --unshallow || true + - uses: actions/setup-python@v4 + with: + python-version: "3.11" + architecture: x64 + - name: Set output vars to the actual tag name + id: vars + run: echo ::set-output name=tag::${GITHUB_REF#refs/*/} + - name: Install vcpkg + id: bootstrapvcpkg + run: | + ${{ github.workspace }}/vcpkg/bootstrap-vcpkg.sh -disableMetrics + shell: bash + - name: Install dependencies in manifest mode + id: installdeps + run: | + ${{ github.workspace }}/vcpkg/vcpkg install --triplet=${{ env.VCPKG_DEP_LIST }}-nes --host-triplet=${{ env.VCPKG_DEP_LIST }}-nes --overlay-triplets=custom-triplets/ --overlay-ports=vcpkg-registry/ports + - name: Compress artifacts + id: compressdeps + run: | + mkdir nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes && \ + mv ${{ github.workspace }}/vcpkg_installed nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/installed && \ + mkdir -p nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/scripts/buildsystems && \ + cp ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake ${{ github.workspace }}/nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/scripts/buildsystems/ && \ + touch ${{ github.workspace }}/nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/.vcpkg-root && \ + 7z a nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes.7z nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes -mx9 -aoa + - name: Release + uses: softprops/action-gh-release@v1 + id: createrelease + with: + files: | + nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes.7z + - name: Upload GitHub Actions artifact of vcpkg build logs + uses: actions/upload-artifact@v2 + if: failure() + id: uploadlogs + with: + name: vcpkg-logs-${{ env.VCPKG_DEP_LIST }} + path: ${{ github.workspace }}/vcpkg/buildtrees/**/*.log + - name: Clean build artifacts + id: cleanbuildartifacts + if: always() + run: | + rm -rf nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes \ + nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-${{ matrix.osversion }}-nes.7z \ + ${{ github.workspace }}/vcpkg/{buildtrees,downloads,packages} \ No newline at end of file From 52344bf49cea1ea4b8a4c46b51c66b7221c503f0 Mon Sep 17 00:00:00 2001 From: Dwi Nugroho Date: Fri, 28 Jul 2023 16:37:16 +0200 Subject: [PATCH 6/6] #38: removed redundant cmake --- docker/Dockerfile-rocky-8.7 | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/Dockerfile-rocky-8.7 b/docker/Dockerfile-rocky-8.7 index 4f43d53..51f9b36 100644 --- a/docker/Dockerfile-rocky-8.7 +++ b/docker/Dockerfile-rocky-8.7 @@ -9,7 +9,6 @@ RUN dnf update -y && dnf install -y \ curl zip unzip tar \ pkg-config \ autoconf \ - cmake \ flex \ openssl-devel \ bison \