Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: downgrade ubuntu docker image #1442

Merged
merged 2 commits into from
Apr 28, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 0 additions & 22 deletions .github/actions/setup-libssl/action.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/actions/setup-postgres-wallet-plugin/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ runs:
# so pointing rust version to 1.63.0
- name: Setup Postgres wallet plugin
run: |
sudo apt-get install -y libzmq3-dev libsodium-dev pkg-config
sudo apt-get install -y libzmq3-dev libsodium-dev pkg-config libssl-dev
curl https://sh.rustup.rs -sSf | bash -s -- -y
export PATH="/root/.cargo/bin:${PATH}"
rustup default 1.63.0
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/continuous-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
release-canary:
runs-on: ubuntu-20.04
runs-on: ubuntu-2004-paid
name: Release Canary
if: "!startsWith(github.event.head_commit.message, 'chore(release): v')"
steps:
Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
git push origin v${{ steps.get-version.outputs.version }} --no-verify

release-stable:
runs-on: ubuntu-20.04
runs-on: ubuntu-2004-paid
name: Create Stable Release
# Only run if the last pushed commit is a release commit
if: "startsWith(github.event.head_commit.message, 'chore(release): v')"
Expand Down
16 changes: 4 additions & 12 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
# validation scripts. To still be able to run the CI we can manually trigger it by adding the 'ci-test'
# label to the pull request
ci-trigger:
runs-on: aries-ubuntu-latest
runs-on: ubuntu-2004-paid
outputs:
triggered: ${{ steps.check.outputs.triggered }}
steps:
Expand All @@ -46,16 +46,13 @@ jobs:
echo "::set-output name=triggered::${SHOULD_RUN}"

validate:
runs-on: aries-ubuntu-latest
runs-on: ubuntu-2004-paid
name: Validate
steps:
- name: Checkout aries-framework-javascript
uses: actions/checkout@v2

# setup dependencies
- name: Setup Libssl
uses: ./.github/actions/setup-libssl

- name: Setup Libindy
uses: ./.github/actions/setup-libindy

Expand All @@ -80,7 +77,7 @@ jobs:
run: yarn build

integration-test:
runs-on: aries-ubuntu-latest
runs-on: ubuntu-2004-paid
name: Integration Tests

strategy:
Expand All @@ -92,8 +89,6 @@ jobs:
uses: actions/checkout@v2

# setup dependencies
- name: Setup Libssl
uses: ./.github/actions/setup-libssl

- name: Setup Libindy
uses: ./.github/actions/setup-libindy
Expand Down Expand Up @@ -132,7 +127,7 @@ jobs:
if: always()

version-stable:
runs-on: aries-ubuntu-latest
runs-on: ubuntu-2004-paid
name: Release stable
needs: [integration-test, validate]
if: github.ref == 'refs/heads/main' && github.event_name == 'workflow_dispatch'
Expand All @@ -144,9 +139,6 @@ jobs:
fetch-depth: 0

# setup dependencies
- name: Setup Libssl
uses: ./.github/actions/setup-libssl

- name: Setup Libindy
uses: ./.github/actions/setup-libindy

Expand Down
12 changes: 2 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:22.04 as base
FROM ubuntu:20.04 as base

ENV DEBIAN_FRONTEND noninteractive

Expand All @@ -9,15 +9,7 @@ RUN apt-get update -y && apt-get install -y \
# Only needed to build indy-sdk
build-essential \
git \
libzmq3-dev libsodium-dev pkg-config

# libssl1.1 (required by libindy)
RUN curl http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1-1ubuntu2.1~18.04.21_amd64.deb -o libssl1.1.deb
RUN dpkg -i libssl1.1.deb

# libssl-dev1.1 (required to compile libindy with posgres plugin)
RUN curl http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl-dev_1.1.1-1ubuntu2.1~18.04.21_amd64.deb -o libssl-dev1.1.deb
RUN dpkg -i libssl-dev1.1.deb
libzmq3-dev libsodium-dev pkg-config libssl-dev

# libindy
RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CE7709D068DB5E88
Expand Down
2 changes: 1 addition & 1 deletion demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"dependencies": {
"@hyperledger/indy-vdr-nodejs": "^0.1.0-dev.14",
"@hyperledger/anoncreds-nodejs": "^0.1.0-dev.14",
"@hyperledger/anoncreds-nodejs": "^0.1.0-dev.15",
"@hyperledger/aries-askar-nodejs": "^0.1.0-dev.8",
"inquirer": "^8.2.5"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/anoncreds-rs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@
"dependencies": {
"@aries-framework/core": "0.3.3",
"@aries-framework/anoncreds": "0.3.3",
"@hyperledger/anoncreds-shared": "^0.1.0-dev.14",
"@hyperledger/anoncreds-shared": "^0.1.0-dev.15",
"class-transformer": "^0.5.1",
"class-validator": "0.14.0",
"rxjs": "^7.2.0",
"tsyringe": "^4.7.0"
},
"devDependencies": {
"@hyperledger/anoncreds-nodejs": "^0.1.0-dev.14",
"@hyperledger/anoncreds-nodejs": "^0.1.0-dev.15",
"reflect-metadata": "^0.1.13",
"rimraf": "^4.4.0",
"typescript": "~4.9.5"
Expand Down
2 changes: 1 addition & 1 deletion packages/anoncreds/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
},
"devDependencies": {
"@aries-framework/node": "0.3.3",
"@hyperledger/anoncreds-nodejs": "^0.1.0-dev.14",
"@hyperledger/anoncreds-nodejs": "^0.1.0-dev.15",
"indy-sdk": "^1.16.0-dev-1636",
"rimraf": "^4.4.0",
"rxjs": "^7.8.0",
Expand Down
18 changes: 9 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1036,23 +1036,23 @@
resolved "https://registry.yarnpkg.com/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz#98c23c950a3d9b6c8f0daed06da6c3af06981340"
integrity sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==

"@hyperledger/anoncreds-nodejs@^0.1.0-dev.14":
version "0.1.0-dev.14"
resolved "https://registry.yarnpkg.com/@hyperledger/anoncreds-nodejs/-/anoncreds-nodejs-0.1.0-dev.14.tgz#00d4dca419f04a580cc02611d0c803d3d5c04fbf"
integrity sha512-N0H89rRBOaLeX+j5NHSibU1m88lWOXWg2t/orZZtY9iTt8op1oFV0IcWHeUJ1lPDJnOiozpn+AF/f5G0kipK7w==
"@hyperledger/anoncreds-nodejs@^0.1.0-dev.15":
version "0.1.0-dev.15"
resolved "https://registry.yarnpkg.com/@hyperledger/anoncreds-nodejs/-/anoncreds-nodejs-0.1.0-dev.15.tgz#8d248f53c318d91e82030a7fb23740fe4b2bef7a"
integrity sha512-3QiKzjVhbQ+N07vMiR0XCBxxy51RwhKf/z0/mHiVYy1ZcmuTok5dE/jTjAwmHh+jvuAwqk+O4ebWmFItRx1K7Q==
dependencies:
"@hyperledger/anoncreds-shared" "0.1.0-dev.14"
"@hyperledger/anoncreds-shared" "0.1.0-dev.15"
"@mapbox/node-pre-gyp" "^1.0.10"
ffi-napi "4.0.3"
node-cache "5.1.2"
ref-array-di "1.2.2"
ref-napi "3.0.3"
ref-struct-di "1.1.1"

"@hyperledger/anoncreds-shared@0.1.0-dev.14", "@hyperledger/anoncreds-shared@^0.1.0-dev.14":
version "0.1.0-dev.14"
resolved "https://registry.yarnpkg.com/@hyperledger/anoncreds-shared/-/anoncreds-shared-0.1.0-dev.14.tgz#0cdaa18a59b8223bb3eb2116970b1aa56cf5acfc"
integrity sha512-4yS7NgZZF9nfE50OquvbLWuZSzjOOiPufC/n2Ywb5lL2VloBblXMI2CezCZU1POmyAl7xnoT99pi2Od1fQaJxQ==
"@hyperledger/anoncreds-shared@0.1.0-dev.15", "@hyperledger/anoncreds-shared@^0.1.0-dev.15":
version "0.1.0-dev.15"
resolved "https://registry.yarnpkg.com/@hyperledger/anoncreds-shared/-/anoncreds-shared-0.1.0-dev.15.tgz#644e9cbc16a174f46b2f54dd7cb215a251d3da0a"
integrity sha512-nTO5KDTlDxpadk1j/r5T8E4wfS16rWKgZpyyG6dxg/7WhwZQkIcTsbPNnPH+NHklGju/ee+WT7rWlojpJ6XFVQ==

"@hyperledger/aries-askar-nodejs@^0.1.0-dev.8":
version "0.1.0-dev.8"
Expand Down