Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: openwallet-foundation/vcx
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d07c054f8e30fbddf8f42da573e1fe1ddbb7170b
Choose a base ref
..
head repository: openwallet-foundation/vcx
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2821f112983c69d8172570a165f6ac5d761f2ac3
Choose a head ref
Showing 555 changed files with 16,571 additions and 9,748 deletions.
35 changes: 35 additions & 0 deletions .github/actions/check-ports/action.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: "check-ports"
description: 'Checks whether a space separated list of local ports is reachable'

inputs:
ports:
description: 'The local ports to check'
required: true
tries:
description: 'The max number of times to check whether each port is open'
required: false
default: 100
interval:
description: 'The interval to wait in between tries'
required: false
default: 5

runs:
using: "composite"
steps:
- name: "Check ports"
shell: bash
run: |
for p in ${{ inputs.ports }}; do
counter=0
while [[ `nc -z localhost $p; echo $?` -ne 0 && $counter -ne ${{ inputs.tries }} ]]; do
sleep ${{ inputs.interval }}
counter=$(( $counter + 1 ))
done
if [[ $counter -eq ${{ inputs.tries }} ]]; then
echo "Port $p is unreachable!"
exit 1;
fi
done
2 changes: 1 addition & 1 deletion .github/actions/derive-cache-info/action.yml
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ runs:
- id: main
shell: bash
run: |
source ./ci/util.sh
source ./.github/ci/util.sh
DOCKER_IMG=${{ inputs.docker-img }}
CACHE_KEY=`as_docker_cache_key $DOCKER_IMG`
CACHE_DIR="/tmp/cachedir-$CACHE_KEY"
30 changes: 0 additions & 30 deletions .github/actions/publish-android/action.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/actions/setup-codecov-rust/action.yml
Original file line number Diff line number Diff line change
@@ -29,4 +29,4 @@ runs:
docker run --rm -d --name mysql --network host -e MYSQL_ROOT_PASSWORD=mysecretpassword mysql:5.7.35
docker run --rm -d --name indypool --network host ${{ env.DOCKER_IMAGE_POOL }}
sleep 5
docker-compose -f ./ci/agency/docker-compose.yml up -d
docker-compose -f ./.github/ci/agency/docker-compose.yml up -d
7 changes: 5 additions & 2 deletions .github/actions/setup-testing-nodejs/action.yml
Original file line number Diff line number Diff line change
@@ -2,6 +2,9 @@ name: "setup-testing-nodejs"
description: 'Install library deps, build libvcx'

inputs:
rust-toolchain-version:
description: 'The Rust toolchain version to use'
required: true
skip-docker-setup:
description: 'If true, skip spinning up docker containers'
required: false
@@ -23,7 +26,7 @@ runs:
npm install -g npm@8.19.3
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.65.0
toolchain: ${{ inputs.rust-toolchain-version }}
- uses: Swatinem/rust-cache@v2
- name: "Install dependencies"
shell: bash
@@ -37,7 +40,7 @@ runs:
docker run --rm -d --name mysql --network host -e MYSQL_ROOT_PASSWORD=mysecretpassword mysql:5.7.35
docker run --rm -d --name indypool --network host ${{ env.DOCKER_IMAGE_POOL }}
sleep 5
docker-compose -f ./ci/agency/docker-compose.yml up -d
docker-compose -f ./.github/ci/agency/docker-compose.yml up -d
- name: "Build binding module"
shell: bash
run: (cd wrappers/vcx-napi-rs && npm install && npm run build:napi:debug)
20 changes: 19 additions & 1 deletion .github/actions/setup-testing-rust/action.yml
Original file line number Diff line number Diff line change
@@ -2,6 +2,9 @@ name: "setup-testing-rust"
description: 'Setup host environment to run rust tests'

inputs:
rust-toolchain-version:
description: 'The Rust toolchain version to use'
required: true
skip-docker-setup:
description: 'If true, skip spinning up docker containers'
required: false
@@ -16,21 +19,36 @@ runs:
steps:
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.65.0
toolchain: ${{ inputs.rust-toolchain-version }}

- uses: Swatinem/rust-cache@v2
- name: "Install dependencies"
shell: bash
run: |
sudo apt-get update -y
sudo apt-get install -y libsodium-dev libssl-dev libzmq3-dev
- name: "Start indypool, mysql, agency"
if: ${{ inputs.skip-docker-setup != 'true' }}
shell: bash
run: |
docker run -d --name mysql --network host -e MYSQL_ROOT_PASSWORD=mysecretpassword mysql:5.7.35
docker run -d --name indypool --network host ${{ env.DOCKER_IMAGE_POOL }}
- name: "Check indy ports"
if: ${{ inputs.skip-docker-setup != 'true' }}
uses: ./.github/actions/check-ports
with:
ports: "9701 9702 9703 9704 9705 9706 9707 9708"

- name: "Start vdrproxy"
if: ${{ inputs.skip-vdrproxy-setup != 'true' }}
shell: bash
run: |
docker run -d --name vdrproxy --network host ${{ env.DOCKER_IMAGE_VDRPROXY }} -p ${{ env.VDR_PROXY_PORT }} -g ${{ env.GENESIS_URL }}
- name: "Check vdrproxy port"
if: ${{ inputs.skip-vdrproxy-setup != 'true' }}
uses: ./.github/actions/check-ports
with:
ports: "3030"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading