From 00dab20789c51900698cd298aa9144a9ee27bb0f Mon Sep 17 00:00:00 2001 From: Wade Barnes Date: Thu, 25 Apr 2024 12:58:48 -0700 Subject: [PATCH 1/2] Cleanup package references - Remove references to temporary and personal repositories. Signed-off-by: Wade Barnes --- .devcontainer/Dockerfile | 23 ++++++++----------- .../workflows/build/Dockerfile.ubuntu-2204 | 18 ++++++++------- .../ubuntu-2204/build-3rd-parties.sh | 7 ++++-- build-scripts/ubuntu-2204/prepare-package.sh | 2 +- 4 files changed, 26 insertions(+), 24 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 58f68b5d2..d5b769cfa 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -26,24 +26,21 @@ RUN apt-get update -y && apt-get install -y \ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && \ # Sovrin apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 && \ - # bionic-security + # Bionic-Security apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32 # ======================================================================================================== +# ToDo: +# - Eliminate dependency on obsolete bionic repositories. + # Plenum # - https://github.com/hyperledger/indy-plenum/issues/1546 # - Needed to pick up rocksdb=5.8.8 -RUN echo "deb https://hyperledger.jfrog.io/artifactory/indy focal dev" >> /etc/apt/sources.list && \ +RUN echo "deb https://hyperledger.jfrog.io/artifactory/indy jammy dev" >> /etc/apt/sources.list && \ echo "deb http://security.ubuntu.com/ubuntu bionic-security main" >> /etc/apt/sources.list && \ echo "deb https://repo.sovrin.org/deb bionic master" >> /etc/apt/sources.list && \ echo "deb https://repo.sovrin.org/sdk/deb bionic master" >> /etc/apt/sources.list -# Kim's temp repo -# TODO: -# - Remove dependency on Kim's temp repo. -# - Change this to official repo -RUN echo "deb [trusted=yes] http://209.141.41.82:8000/ packagedir/" >> /etc/apt/sources.list - RUN apt-get update -y && apt-get install -y \ # Python python3-pip \ @@ -69,10 +66,11 @@ RUN apt-get update -y && apt-get install -y \ ursa=0.3.2-1 \ # Indy SDK libindy=1.15.0~1625-bionic \ - # Kim's updated packages - # - TODO: Remove dependency on Kim's temp repo. - python3-sortedcontainers \ - python3-rlp \ + # ToDo: + # - Necessary updates to this package have not been published yet. + # - This deb is a special build using the code here: + # - https://github.com/ioflo/ioflo/commit/45bcddbf680d22af84469406a04286ff1c79043a + # - This line can be removed once the release containing these changes is available on PyPi python3-ioflo \ # Need to move libursa.so to parent dir && mv /usr/lib/ursa/* /usr/lib && rm -rf /usr/lib/ursa @@ -87,6 +85,5 @@ RUN pip3 install -U \ flake8==3.8.4 \ Cython==0.29.36 - # install fpm RUN gem install --no-document rake dotenv:2.8.1 fpm:1.15.0 diff --git a/.github/workflows/build/Dockerfile.ubuntu-2204 b/.github/workflows/build/Dockerfile.ubuntu-2204 index 0de89a80f..614eb0623 100644 --- a/.github/workflows/build/Dockerfile.ubuntu-2204 +++ b/.github/workflows/build/Dockerfile.ubuntu-2204 @@ -19,19 +19,21 @@ RUN apt-get update -y && apt-get install -y \ # Hyperledger RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && \ # Sovrin - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 && \ + # Bionic-Security + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32 # ======================================================================================================== +# ToDo: +# - Eliminate dependency on obsolete bionic repositories. + # Plenum # - https://github.com/hyperledger/indy-plenum/issues/1546 # - Needed to pick up rocksdb=5.8.8 -#RUN echo "deb https://hyperledger.jfrog.io/artifactory/indy focal dev" >> /etc/apt/sources.list && \ -# echo "deb https://repo.sovrin.org/deb bionic master" >> /etc/apt/sources.list && \ -# echo "deb https://repo.sovrin.org/sdk/deb bionic master" >> /etc/apt/sources.list - -# TODO change this to official repo -RUN echo "deb [trusted=yes] http://209.141.41.82:8000/ packagedir/" >> /etc/apt/sources.list - +RUN echo "deb https://hyperledger.jfrog.io/artifactory/indy jammy dev" >> /etc/apt/sources.list && \ + echo "deb http://security.ubuntu.com/ubuntu bionic-security main" >> /etc/apt/sources.list && \ + echo "deb https://repo.sovrin.org/deb bionic master" >> /etc/apt/sources.list && \ + echo "deb https://repo.sovrin.org/sdk/deb bionic master" >> /etc/apt/sources.listst RUN apt-get update -y && apt-get install -y \ # Python diff --git a/build-scripts/ubuntu-2204/build-3rd-parties.sh b/build-scripts/ubuntu-2204/build-3rd-parties.sh index 4900925d1..e8eee146a 100755 --- a/build-scripts/ubuntu-2204/build-3rd-parties.sh +++ b/build-scripts/ubuntu-2204/build-3rd-parties.sh @@ -37,7 +37,7 @@ function build_rocksdb_deb { function build_ioflo_deb { VERSION=$1 - git clone https://github.com/reflectivedevelopment/ioflo.git /tmp/ioflo + git clone https://github.com/ioflo/ioflo.git /tmp/ioflo pushd /tmp/ioflo git checkout $VERSION @@ -161,7 +161,10 @@ build_from_pypi_wheel base58 ### Needs to be pinned to 3.10.1 because from v4.0.0 the package name ends in python3-importlib-metadata_0.0.0_amd64.deb ### https://github.com/hyperledger/indy-plenum/runs/4166593170?check_suite_focus=true#step:5:5304 build_from_pypi_wheel importlib-metadata 3.10.1 -build_ioflo_deb 2.0.3 +# ToDo: +# - Currently being built off a commit from the main repo +# - Update to build from PyPi Wheel once a release containing Kim's updates is available on PyPi +build_ioflo_deb 45bcddbf680d22af84469406a04286ff1c79043a build_from_pypi_wheel jsonpickle build_from_pypi_wheel leveldb build_from_pypi_wheel libnacl 1.6.1 diff --git a/build-scripts/ubuntu-2204/prepare-package.sh b/build-scripts/ubuntu-2204/prepare-package.sh index b08c8f310..84e53fc1a 100755 --- a/build-scripts/ubuntu-2204/prepare-package.sh +++ b/build-scripts/ubuntu-2204/prepare-package.sh @@ -42,4 +42,4 @@ fi popd -echo -e "\nFinished preparing $repo for publishing\n" \ No newline at end of file +echo -e "\nFinished preparing $repo for publishing\n" From 84ef60651d8012b060e2ae7abc1685e68ffe62dc Mon Sep 17 00:00:00 2001 From: Wade Barnes Date: Fri, 26 Apr 2024 10:44:56 -0700 Subject: [PATCH 2/2] Ensure GHA jobs are running on ubuntu 22.04 with python 3.10 Signed-off-by: Wade Barnes --- .github/workflows/reuseable_test.yaml | 4 ++-- .github/workflows/tag.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/reuseable_test.yaml b/.github/workflows/reuseable_test.yaml index 485de6a82..65d6c7843 100644 --- a/.github/workflows/reuseable_test.yaml +++ b/.github/workflows/reuseable_test.yaml @@ -14,7 +14,7 @@ jobs: indy_plenum_tests: name: Sliced Module Tests # Reference to workflow-setup job is required to access the GITHUB_REPOSITORY_NAME output. - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest # Fix for scacap/action-surefire-report out of memory error: # - https://github.com/ScaCap/action-surefire-report/issues/17 env: @@ -86,7 +86,7 @@ jobs: indy_plenum_module_tests: name: Module Tests # Reference to workflow-setup job is required to access the GITHUB_REPOSITORY_NAME output. - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest env: UBUNTU_VERSION: ${{ inputs.UBUNTU_VERSION }} container: diff --git a/.github/workflows/tag.yaml b/.github/workflows/tag.yaml index 41cc93674..63c004ed6 100644 --- a/.github/workflows/tag.yaml +++ b/.github/workflows/tag.yaml @@ -33,14 +33,14 @@ jobs: bump_version: name: Bump Version Number needs: taginfos - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Check out code uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v5 with: - python-version: '3.8' + python-version: '3.10' - name: Install deps for version change run: pip install base58 \ importlib_metadata==3.10.1 \