From 694603c19cfba50a5b33e851826eac5754839a1d Mon Sep 17 00:00:00 2001 From: Kim Ebert Date: Wed, 14 May 2025 10:48:15 -0600 Subject: [PATCH 1/7] fix: fix build pacakges workflow Signed-off-by: Kim Ebert --- .github/workflows/buildpackages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buildpackages.yaml b/.github/workflows/buildpackages.yaml index dbec5b0..c720629 100644 --- a/.github/workflows/buildpackages.yaml +++ b/.github/workflows/buildpackages.yaml @@ -79,7 +79,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: '3.10.12' - name: List Python and PIP versions run: | From 1f81b116838171e6675304bfbdfebb37042d2021 Mon Sep 17 00:00:00 2001 From: Kim Ebert Date: Wed, 14 May 2025 13:01:30 -0600 Subject: [PATCH 2/7] fix: try and fix pip install issue Signed-off-by: Kim Ebert --- .github/workflows/buildpackages.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/buildpackages.yaml b/.github/workflows/buildpackages.yaml index c720629..6fddb77 100644 --- a/.github/workflows/buildpackages.yaml +++ b/.github/workflows/buildpackages.yaml @@ -91,7 +91,9 @@ jobs: run: | # Installation of pip==23.0.1 is a workaround for the deprecated --install-option flag # used in plenum's setup.py to install pyzmq==22.3.0. - python3 -m pip install --ignore-installed --upgrade pip==23.0.1 + # python3 -m pip install --ignore-installed --upgrade pip==23.0.1 + curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py + python3 get-pip.py --force-reinstall "pip==23.0.1" python3 -m pip install pytest-runner wheel From 9280ccc63c995b4a4704bb7841953591c985791f Mon Sep 17 00:00:00 2001 From: Kim Ebert Date: Fri, 16 May 2025 08:35:20 -0600 Subject: [PATCH 3/7] chore: publish if not owner Signed-off-by: Kim Ebert --- .github/actions/workflow-setup/action.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/actions/workflow-setup/action.yaml b/.github/actions/workflow-setup/action.yaml index 68b7051..17ea249 100644 --- a/.github/actions/workflow-setup/action.yaml +++ b/.github/actions/workflow-setup/action.yaml @@ -49,13 +49,13 @@ runs: echo "distribution=jammy" >> $GITHUB_OUTPUT echo "::group::DEBUG" # Ensure publishing is only performed when the build is executed from the main organization. - if [[ ${{ github.repository_owner }} == '${{ inputs.ownerRepo }}' ]]; then + #if [[ ${{ github.repository_owner }} == '${{ inputs.ownerRepo }}' ]]; then echo "publish=true" >> $GITHUB_OUTPUT echo "publish = true" - else - echo "publish=false" >> $GITHUB_OUTPUT - echo "publish = false" - fi + #else + # echo "publish=false" >> $GITHUB_OUTPUT + # echo "publish = false" + #fi echo "CACHE_KEY_BUILD=${{ hashFiles('.github/workflows/build/Dockerfile.ubuntu-2204') }}" echo "UBUNTU_VERSION=ubuntu-2204" echo "distribution=jammy" From 593cfc8ec9c5b23d386df7385976546dc1d9aaa6 Mon Sep 17 00:00:00 2001 From: Kim Ebert Date: Fri, 12 Sep 2025 11:28:09 -0600 Subject: [PATCH 4/7] feat: fix 3rd party build Signed-off-by: Kim Ebert --- .github/workflows/buildpackages.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/buildpackages.yaml b/.github/workflows/buildpackages.yaml index 6fddb77..fb93a58 100644 --- a/.github/workflows/buildpackages.yaml +++ b/.github/workflows/buildpackages.yaml @@ -142,7 +142,8 @@ jobs: run: | mkdir -p $GITHUB_WORKSPACE/build-scripts/${{ inputs.UBUNTU_VERSION }}/cache/3rd-party-dependencies/ $GITHUB_WORKSPACE/build-scripts/${{ inputs.UBUNTU_VERSION }}/build-3rd-parties.sh ./cache/3rd-party-dependencies - mv $GITHUB_WORKSPACE/build-scripts/${{ inputs.UBUNTU_VERSION }}/cache/* /tmp/third-party-dependencies + mkdir -p /tmp/third-party-dependencies + mv -v $GITHUB_WORKSPACE/build-scripts/${{ inputs.UBUNTU_VERSION }}/cache/* /tmp/third-party-dependencies - uses: actions/upload-artifact@v4 with: From 410d80d9bde84389f6a52486069a29042bb10695 Mon Sep 17 00:00:00 2001 From: Kim Ebert Date: Fri, 12 Sep 2025 12:03:45 -0600 Subject: [PATCH 5/7] feat: fix 3rd party build to full path Signed-off-by: Kim Ebert --- .github/workflows/buildpackages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buildpackages.yaml b/.github/workflows/buildpackages.yaml index fb93a58..b14eeac 100644 --- a/.github/workflows/buildpackages.yaml +++ b/.github/workflows/buildpackages.yaml @@ -141,7 +141,7 @@ jobs: if: steps.third-party-dependencies.outputs.cache-hit != 'true' run: | mkdir -p $GITHUB_WORKSPACE/build-scripts/${{ inputs.UBUNTU_VERSION }}/cache/3rd-party-dependencies/ - $GITHUB_WORKSPACE/build-scripts/${{ inputs.UBUNTU_VERSION }}/build-3rd-parties.sh ./cache/3rd-party-dependencies + $GITHUB_WORKSPACE/build-scripts/${{ inputs.UBUNTU_VERSION }}/build-3rd-parties.sh $GITHUB_WORKSPACE/build-scripts/${{ inputs.UBUNTU_VERSION }}/cache/3rd-party-dependencies/ mkdir -p /tmp/third-party-dependencies mv -v $GITHUB_WORKSPACE/build-scripts/${{ inputs.UBUNTU_VERSION }}/cache/* /tmp/third-party-dependencies From 315503a1d30d33547c992a00ffb94f2ca52d6f06 Mon Sep 17 00:00:00 2001 From: Kim Ebert Date: Mon, 15 Sep 2025 11:51:19 -0600 Subject: [PATCH 6/7] fix: fix copy for 3rd parties Signed-off-by: Kim Ebert --- .github/workflows/buildpackages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buildpackages.yaml b/.github/workflows/buildpackages.yaml index b14eeac..8ecea19 100644 --- a/.github/workflows/buildpackages.yaml +++ b/.github/workflows/buildpackages.yaml @@ -143,7 +143,7 @@ jobs: mkdir -p $GITHUB_WORKSPACE/build-scripts/${{ inputs.UBUNTU_VERSION }}/cache/3rd-party-dependencies/ $GITHUB_WORKSPACE/build-scripts/${{ inputs.UBUNTU_VERSION }}/build-3rd-parties.sh $GITHUB_WORKSPACE/build-scripts/${{ inputs.UBUNTU_VERSION }}/cache/3rd-party-dependencies/ mkdir -p /tmp/third-party-dependencies - mv -v $GITHUB_WORKSPACE/build-scripts/${{ inputs.UBUNTU_VERSION }}/cache/* /tmp/third-party-dependencies + mv -v $GITHUB_WORKSPACE/build-scripts/${{ inputs.UBUNTU_VERSION }}/cache/3rd-party-dependencies/* /tmp/third-party-dependencies - uses: actions/upload-artifact@v4 with: From cce749304ceff7e7a4a9e84460a78a37ac619df1 Mon Sep 17 00:00:00 2001 From: Kim Ebert Date: Tue, 23 Sep 2025 09:49:32 -0600 Subject: [PATCH 7/7] chore: cleanup for hyperledger Signed-off-by: Kim Ebert --- .github/actions/workflow-setup/action.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/actions/workflow-setup/action.yaml b/.github/actions/workflow-setup/action.yaml index 17ea249..68b7051 100644 --- a/.github/actions/workflow-setup/action.yaml +++ b/.github/actions/workflow-setup/action.yaml @@ -49,13 +49,13 @@ runs: echo "distribution=jammy" >> $GITHUB_OUTPUT echo "::group::DEBUG" # Ensure publishing is only performed when the build is executed from the main organization. - #if [[ ${{ github.repository_owner }} == '${{ inputs.ownerRepo }}' ]]; then + if [[ ${{ github.repository_owner }} == '${{ inputs.ownerRepo }}' ]]; then echo "publish=true" >> $GITHUB_OUTPUT echo "publish = true" - #else - # echo "publish=false" >> $GITHUB_OUTPUT - # echo "publish = false" - #fi + else + echo "publish=false" >> $GITHUB_OUTPUT + echo "publish = false" + fi echo "CACHE_KEY_BUILD=${{ hashFiles('.github/workflows/build/Dockerfile.ubuntu-2204') }}" echo "UBUNTU_VERSION=ubuntu-2204" echo "distribution=jammy"