Merge pull request #453 from WadeBarnes/main

Update branch names in workflows.
sovrin-foundation · Feb 13, 2024 · feb2820 · feb2820
2 parents d1187a2 + a0b54ca
commit feb2820
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 92 deletions.
diff --git a/.github/workflows/PR.yaml b/.github/workflows/PR.yaml
@@ -2,13 +2,7 @@ name: token-plugin-pr
 on:
   pull_request:
     branches:
-      - master
-      - gha-ubuntu-20.04
-      - ubuntu-20.04
-      - ubuntu-20.04-upgrade
-      - Devcontainers
-      - GHARefactoring
-      - fix/dependancy-scheme
+      - main
     paths:
       - '**'
       - '!sovtokenfees/sovtokenfees/metadata.json'
@@ -32,15 +26,15 @@ jobs:
       testsNeeded: ${{ steps.testsNeeded.outputs.testsNeeded }}
     steps:
       - name: checkout source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: setup
         id: setup
         uses: hyperledger/indy-shared-gha/.github/actions/workflow-setup@v1
         with:
           ownerRepo: "sovrin-foundation"
       - name: testsNeeded
         id: testsNeeded
-        uses: dorny/paths-filter@v2
+        uses: dorny/paths-filter@v3
         with:
           filters: |
             testsNeeded:

diff --git a/.github/workflows/Push.yaml b/.github/workflows/Push.yaml
@@ -3,13 +3,7 @@ name: token-plugin-push
 on:
   push:
     branches:
-      - master
-      - gha-ubuntu-20.04
-      - ubuntu-20.04
-      - ubuntu-20.04-upgrade
-      - Devcontainers
-      - GHARefactoring
-      - fix/dependancy-scheme
+      - main
     paths:
       - '**.py'
       - '.github/**'
@@ -30,7 +24,7 @@ jobs:
       publish: ${{ steps.setup.outputs.publish }}
     steps:
       - name: checkout source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: setup
         id: setup
         uses: hyperledger/indy-shared-gha/.github/actions/workflow-setup@v1

diff --git a/.github/workflows/build/Dockerfile.ubuntu-2004 b/.github/workflows/build/Dockerfile.ubuntu-2004
@@ -6,11 +6,10 @@ ARG user=indy
 ARG DEBIAN_FRONTEND=noninteractive
 ENV TZ=America/Los_Angeles
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y 
+RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y
 
-RUN apt-get update -y \
-    && echo "deb http://security.ubuntu.com/ubuntu bionic main"  >> /etc/apt/sources.list \
-    && apt-get install -y --allow-downgrades \
+RUN echo "deb http://security.ubuntu.com/ubuntu bionic main"  >> /etc/apt/sources.list && \
+    apt-get update -y && apt-get install -y --allow-downgrades \
     # common stuff
     git \
     wget \
@@ -19,7 +18,7 @@ RUN apt-get update -y \
     apt-utils \
     nano \
     software-properties-common \
-    supervisor \ 
+    supervisor \
     # Python
     python3-pip \
     python3-nacl \
@@ -29,50 +28,44 @@ RUN apt-get update -y \
     librocksdb-dev \
     libsnappy-dev \
     liblz4-dev \
-    libbz2-dev \
-    && rm -rf /var/lib/apt/lists/*
-
-# fails when executed in one command with other pip install packages
-# RUN pip install python-rocksdb
+    libbz2-dev
 
 RUN echo "deb http://security.ubuntu.com/ubuntu bionic-security main"  >> /etc/apt/sources.list && \
-    apt-get update && apt-get install -y \ 
+    apt-get update -y && apt-get install -y \
     libssl1.0.0 \
     libssl1.1
 # Indy Node and Plenum
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 \
     && echo "deb https://repo.sovrin.org/deb bionic master" >> /etc/apt/sources.list \
-    && apt-get update && apt-get install -y \ 
+    && apt-get update && apt-get install -y \
     ursa
 # install fpm
-ENV FPM_VERSION=1.9.3
-RUN apt-get update \
-    && apt-add-repository ppa:brightbox/ruby-ng \
-    && apt-get install -y --no-install-recommends \
-    ruby2.6 \
-    ruby2.6-dev \
-    && gem install --no-document rake fpm:$FPM_VERSION \
-    && rm -rf /var/lib/apt/lists/*
+ENV FPM_VERSION=1.14.2
+ENV DOTENV_VERSION=2.8.1
+RUN apt-get update -y && apt-get install -y \
+    ruby \
+    ruby-dev \
+    rubygems \
+    && gem install --no-document rake dotenv:$DOTENV_VERSION fpm:$FPM_VERSION
 
 # Need to move libursa.so to parent dir
 RUN mv /usr/lib/ursa/* /usr/lib && rm -rf /usr/lib/ursa
 
 # Indy SDK
-# RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88 || \
-# 	apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CE7709D068DB5E88 && \
-RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 68DB5E88 \ 
-    && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9692C00E657DDE61 \ 
+RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 68DB5E88 \
+    && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9692C00E657DDE61 \
     && add-apt-repository "deb https://hyperledger.jfrog.io/artifactory/indy focal dev" \
     && add-apt-repository "deb https://repo.sovrin.org/deb xenial master" \
     && add-apt-repository "deb https://repo.sovrin.org/sdk/deb xenial master" \
     && add-apt-repository "deb https://repo.sovrin.org/sdk/deb bionic master" \
     && add-apt-repository "deb http://archive.ubuntu.com/ubuntu xenial universe main" \
-    && apt-get update -y && apt-get install -y \ 
+    && apt-get update -y && apt-get install -y \
     libindy=1.15.0~1625-bionic \
     libsodium23
 
 # pypi based packages
 RUN pip3 install -U \
+    Cython==0.29.36 \
     Pygments==2.2.0 \
     Pympler==0.8 \
     PyNaCl==1.3.0 \
@@ -124,13 +117,11 @@ RUN pip3 install -U \
     wheel==0.34.2 \
     zipp==1.2.0 \
     mock
-# virtualenv \
-# python-rocksdb==0.7
 
 COPY ./deps .
 RUN dpkg -i libsovtoken_1.0.2_amd64.deb
 
 RUN mkdir -p /etc/indy && echo "ENABLED_PLUGINS = ['sovtoken', 'sovtokenfees']" > /etc/indy/indy_config.py
 
 RUN apt-get -y autoremove
-RUN rm -rf /var/lib/apt/lists/*
+RUN rm -rf /var/lib/apt/lists/*
diff --git a/.github/workflows/publishRelease.yaml b/.github/workflows/publishRelease.yaml
@@ -32,7 +32,7 @@ jobs:
       publish: ${{ steps.workflow-setup.outputs.publish}}
     steps:
       - name: checkout source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: get-release-info
         id: get-release-info
         uses: hyperledger/indy-shared-gha/.github/actions/get-release-info@v1
@@ -51,7 +51,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download sovtoken deb Artifacts from Github Action Artifacts
         uses: dawidd6/action-download-artifact@v2
@@ -86,22 +86,22 @@ jobs:
           name: sovtokenfees-python
           path: artifacts/sovtokenfees-python
       - name: Upload sovtoken-deb
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: sovtoken-deb
           path: artifacts/sovtoken-deb
       - name: Upload sovtoken-python
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: sovtoken-python
           path: artifacts/sovtoken-python
       - name: Upload sovtokenfees-deb
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: sovtokenfees-deb
           path: artifacts/sovtokenfees-deb
       - name: Upload sovtokenfees-python
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: sovtokenfees-python
           path: artifacts/sovtokenfees-python

diff --git a/.github/workflows/releasepr.yaml b/.github/workflows/releasepr.yaml
@@ -24,7 +24,7 @@ jobs:
       distribution: ${{ steps.workflow-setup.outputs.distribution }}
     steps:
       - name: checkout source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: get-release-info
         id: get-release-info
         uses: hyperledger/indy-shared-gha/.github/actions/get-release-info@v1

diff --git a/.github/workflows/reuseable_build_package.yaml b/.github/workflows/reuseable_build_package.yaml
@@ -39,7 +39,7 @@ jobs:
       - name: adding github workspace as safe directory
         run: git config --global --add safe.directory $GITHUB_WORKSPACE
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set Version with UX-timestamp
         if: ${{ inputs.isDev }}
         run: python3 updateVersion.py --timestamp ${{ needs.timestamp.outputs.timestamp }}
@@ -102,12 +102,12 @@ jobs:
 
           mv ./*.deb /tmp/build-output
       - name: Upload sovtoken-deb
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: sovtoken-deb
           path: /tmp/build-output/sovtoken_*.deb
       - name: Upload sovtokenfees-deb
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: sovtokenfees-deb
           path: /tmp/build-output/sovtokenfees_*.deb
@@ -120,13 +120,13 @@ jobs:
       image: ghcr.io/${{ inputs.GITHUB_REPOSITORY_NAME }}/token-plugin-build:${{ inputs.UBUNTU_VERSION }}
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set Version with UX-timestamp
         if: ${{ inputs.isDev }}
         run: python3 updateVersion.py --timestamp ${{ needs.timestamp.outputs.timestamp }}
       - name: Build python sovtoken package
         run: python3 sovtoken/setup.py sdist --dist-dir /tmp/dist bdist_wheel --dist-dir /tmp/dist
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: sovtoken-python
           path: /tmp/dist
@@ -140,13 +140,13 @@ jobs:
       image: ghcr.io/${{ inputs.GITHUB_REPOSITORY_NAME }}/token-plugin-build:${{ inputs.UBUNTU_VERSION }}
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set Version with UX-timestamp
         if: ${{ inputs.isDev }}
         run: python3 updateVersion.py --timestamp ${{ needs.timestamp.outputs.timestamp }}
       - name: Build python sovtokenfees package
         run: python3 sovtokenfees/setup.py sdist --dist-dir /tmp/dist bdist_wheel --dist-dir /tmp/dist
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: sovtokenfees-python
           path: /tmp/dist

diff --git a/.github/workflows/reuseable_test.yaml b/.github/workflows/reuseable_test.yaml
@@ -49,7 +49,7 @@ jobs:
       fail-fast: false
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install dependencies
         run: |
@@ -61,7 +61,7 @@ jobs:
 
       - name: Publish Test Report
         if: success() || failure()
-        uses: scacap/action-surefire-report@v1.0.7
+        uses: scacap/action-surefire-report@v1
         continue-on-error: true
         with:
           check_name: Token Plugin ${{ matrix.module }} / ${{ matrix.dir }} Test Report

diff --git a/.github/workflows/tag.yaml b/.github/workflows/tag.yaml
@@ -16,7 +16,7 @@ jobs:
       BASE: ${{ steps.get-branch.outputs.branch }}
     steps:
       - name: checkout source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: extract branch
@@ -36,7 +36,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Python
         uses: actions/setup-python@v3
         with: