Skip to content

Commit

Permalink
Merge pull request #273 from aeternity/develop
Browse files Browse the repository at this point in the history
Update sdk and urls and versions
  • Loading branch information
alex-k8 authored Oct 15, 2024
2 parents 0cd6477 + 3d5ec6c commit d9f0052
Show file tree
Hide file tree
Showing 42 changed files with 6,908 additions and 2,312 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/contract-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@master
- name: Use Node.js 16.x
uses: actions/setup-node@v1
- name: Use Node.js 20.x
uses: actions/setup-node@v4.0.4
with:
node-version: 16.x
node-version: 20.x
- run: |
cd contract
npm ci
npx aeproject env --nodeVersion v6.6.0 --compilerVersion v6.1.0 && sleep 3
npx aeproject test
npx aeproject test
6 changes: 3 additions & 3 deletions .github/workflows/dev-backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,21 +47,21 @@ jobs:
echo GIT_SHA=$(git rev-parse --short HEAD) >> $GITHUB_OUTPUT
- name: Log in to dockerhub
uses: docker/login-action@v1
uses: docker/login-action@v3.3.0
with:
username: ${{ secrets.DOCKERHUB_USER }}
password: ${{ secrets.DOCKERHUB_PASS }}

- name: Extract metadata for docker
id: meta
uses: docker/metadata-action@v3
uses: docker/metadata-action@v5.5.1
with:
images: aeternitybot/state-channel-demo-backend
tags: |
type=raw,value=develop,enable=${{ endsWith(GitHub.ref, 'develop') }}
- name: Build and push docker image
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6.7.0
with:
context: .
file: ./server/Dockerfile
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/dev-frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
install: true

- name: Cache Docker layers
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: /tmp/.buildx-cache
# Key is named differently to avoid collision
Expand All @@ -47,21 +47,21 @@ jobs:
echo GIT_SHA=$(git rev-parse --short HEAD) >> $GITHUB_OUTPUT
- name: Log in to dockerhub
uses: docker/login-action@v1
uses: docker/login-action@v3.3.0
with:
username: ${{ secrets.DOCKERHUB_USER }}
password: ${{ secrets.DOCKERHUB_PASS }}

- name: Extract metadata for docker
id: meta
uses: docker/metadata-action@v3
uses: docker/metadata-action@v5.5.1
with:
images: aeternitybot/state-channel-demo-frontend
tags: |
type=raw,value=develop,enable=${{ endsWith(GitHub.ref, 'develop') }}
- name: Build and push docker image
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6.7.0
with:
context: .
file: ./client/Dockerfile
Expand All @@ -73,7 +73,7 @@ jobs:
VITE_BOT_SERVICE_URL=https://develop-state-channel-demo-backend.dev.service.aepps.com
VITE_CLIENT_PORT=8000
VITE_NODE_URL=https://testnet.aeternity.io
VITE_COMPILER_URL=https://compiler.aepps.com
VITE_COMPILER_URL=https://v7.compiler.aepps.com/
VITE_WS_URL=wss://testnet.aeternity.io/channel
VITE_FAUCET_PUBLIC_ADDRESS=ak_2iBPH7HUz3cSDVEUWiHg76MZJ6tZooVNBmmxcgVK6VV8KAE688
VITE_NETWORK_ID=ae_uat
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/prd-backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
install: true

- name: Cache Docker layers
uses: actions/cache@v3
uses: actions/cache@v4.0.2
with:
path: /tmp/.buildx-cache
# Key is named differently to avoid collision
Expand All @@ -47,15 +47,15 @@ jobs:
echo GIT_SHA=$(git rev-parse --short HEAD) >> $GITHUB_OUTPUT
- name: Log in to dockerhub
uses: docker/login-action@v1
uses: docker/login-action@v3.3.0
with:
username: ${{ secrets.DOCKERHUB_USER }}
password: ${{ secrets.DOCKERHUB_PASS }}

- name: Extract metadata for docker
if: github.event_name == 'push'
id: meta
uses: docker/metadata-action@v3
uses: docker/metadata-action@v5.5.1
with:
images: aeternitybot/state-channel-demo-backend
tags: |
Expand All @@ -65,7 +65,7 @@ jobs:
if: |
github.event_name == 'push' ||
startsWith(github.ref, 'refs/tags/v')
uses: docker/build-push-action@v3
uses: docker/build-push-action@v6.7.0
with:
context: .
file: ./server/Dockerfile
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/prd-frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
install: true

- name: Cache Docker layers
uses: actions/cache@v2
uses: actions/cache@v4.0.2
with:
path: /tmp/.buildx-cache
# Key is named differently to avoid collision
Expand All @@ -40,7 +40,7 @@ jobs:
${{ runner.os }}-${{ env.ENV }}-buildx
- name: Log in to dockerhub
uses: docker/login-action@v1
uses: docker/login-action@v3.3.0
with:
username: ${{ secrets.DOCKERHUB_USER }}
password: ${{ secrets.DOCKERHUB_PASS }}
Expand All @@ -55,15 +55,15 @@ jobs:
- name: Extract metadata for docker
if: github.event_name == 'push'
id: meta
uses: docker/metadata-action@v3
uses: docker/metadata-action@v5.5.1
with:
images: aeternitybot/state-channel-demo-frontend
tags: |
type=raw,value=latest,enable=${{ endsWith(GitHub.ref, 'main') }}
- name: Build and push docker image
if: github.event_name == 'push'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v6.7.0
with:
context: .
file: ./client/Dockerfile
Expand All @@ -75,7 +75,7 @@ jobs:
VITE_BOT_SERVICE_URL=https://state-channel-demo-backend.prd.service.aepps.com
VITE_CLIENT_PORT=8000
VITE_NODE_URL=https://testnet.aeternity.io
VITE_COMPILER_URL=https://compiler.aepps.com
VITE_COMPILER_URL=https://v7.compiler.aepps.com/
VITE_WS_URL=wss://testnet.aeternity.io/channel
VITE_FAUCET_PUBLIC_ADDRESS=ak_2iBPH7HUz3cSDVEUWiHg76MZJ6tZooVNBmmxcgVK6VV8KAE688
VITE_NETWORK_ID=ae_uat
Expand All @@ -93,7 +93,7 @@ jobs:
rm -rf /tmp/.buildx-cache
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
repository: aeternity/gitops-apps-aelabs.git
token: ${{ secrets.BOT_GITHUB_TOKEN }}
Expand Down
20 changes: 9 additions & 11 deletions .github/workflows/stg-backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
install: true

- name: Cache Docker layers
uses: actions/cache@v2
uses: actions/cache@v4.0.2
with:
path: /tmp/.buildx-cache
# Key is named differently to avoid collision
Expand All @@ -41,20 +41,18 @@ jobs:
${{ runner.os }}-${{ env.ENV }}-buildx
- name: Log in to dockerhub
uses: docker/login-action@v1
uses: docker/login-action@v3.3.0
with:
username: ${{ secrets.DOCKERHUB_USER }}
password: ${{ secrets.DOCKERHUB_PASS }}

- name: Extract metadata for docker
if: github.event_name == 'pull_request' && github.event.action == 'opened' || github.event.action == 'synchronize'
id: meta
uses: docker/metadata-action@v3
uses: docker/metadata-action@v5.5.1
with:
images: aeternitybot/state-channel-demo-backend
tags: |
type=raw,value=latest,enable=${{ endsWith(GitHub.ref, 'main') }}
type=ref,event=tag
type=ref,event=pr
- name: Get commit sha on PR Sync
Expand All @@ -66,7 +64,7 @@ jobs:
- name: Build and push docker image
if: github.event_name == 'pull_request' && github.event.action == 'opened' || github.event.action == 'synchronize'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v6.7.0
with:
context: .
file: ./server/Dockerfile
Expand All @@ -87,7 +85,7 @@ jobs:
rm -rf /tmp/.buildx-cache
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
repository: aeternity/gitops-apps-aelabs.git
token: ${{ secrets.BOT_GITHUB_TOKEN }}
Expand All @@ -99,7 +97,7 @@ jobs:
if: github.event_name == 'pull_request' && github.event.action == 'synchronize'
uses: aeternity/ae-github-actions/deploy-status@v7
with:
url: https://pr-${{ env.PR_NUMBER }}-${{ env.APP }}.${{ env.ENV }}.aepps.com
url: https://pr-${{ env.PR_NUMBER }}-${{ env.APP }}.${{ env.ENV }}.service.aepps.com

- name: Staging PR Sync
if: github.event_name == 'pull_request' && github.event.action == 'synchronize'
Expand All @@ -112,15 +110,15 @@ jobs:

- name: Staging deploy
if: github.event_name == 'pull_request' && github.event.action == 'opened'
uses: aeternity/ae-github-actions/argocd-deploy@v4
uses: aeternity/ae-github-actions/argocd-deploy@v5
with:
url-prefix: pr-${{ env.PR_NUMBER }}
env: ${{ env.ENV }}
app: ${{ env.APP }}

- name: Staging undeploy
if: github.event_name == 'pull_request' && github.event.action == 'closed' && startsWith(github.head_ref, 'release') != true
uses: aeternity/ae-github-actions/argocd-undeploy@v4
uses: aeternity/ae-github-actions/argocd-undeploy@v5
with:
url-prefix: pr-${{ env.PR_NUMBER }}
env: ${{ env.ENV }}
Expand All @@ -132,7 +130,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
msg: Deployed to https://pr-${{ env.PR_NUMBER }}-${{ env.APP }}.${{ env.ENV }}.aepps.com
msg: Deployed to https://pr-${{ env.PR_NUMBER }}-${{ env.APP }}.${{ env.ENV }}.service.aepps.com
check_for_duplicate_msg: true

- name: Push changes
Expand Down
22 changes: 10 additions & 12 deletions .github/workflows/stg-frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
install: true

- name: Cache Docker layers
uses: actions/cache@v2
uses: actions/cache@v4.0.2
with:
path: /tmp/.buildx-cache
# Key is named differently to avoid collision
Expand All @@ -41,20 +41,18 @@ jobs:
${{ runner.os }}-${{ env.ENV }}-buildx
- name: Log in to dockerhub
uses: docker/login-action@v1
uses: docker/login-action@v3.3.0
with:
username: ${{ secrets.DOCKERHUB_USER }}
password: ${{ secrets.DOCKERHUB_PASS }}

- name: Extract metadata for docker
if: github.event_name == 'pull_request' && github.event.action == 'opened' || github.event.action == 'synchronize'
id: meta
uses: docker/metadata-action@v3
uses: docker/metadata-action@v5.5.1
with:
images: aeternitybot/state-channel-demo-frontend
tags: |
type=raw,value=latest,enable=${{ endsWith(GitHub.ref, 'main') }}
type=ref,event=tag
type=ref,event=pr
- name: Get commit sha on PR Sync
Expand All @@ -66,7 +64,7 @@ jobs:
- name: Build and push docker image
if: github.event_name == 'pull_request' && github.event.action == 'opened' || github.event.action == 'synchronize'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v6.7.0
with:
context: .
file: ./client/Dockerfile
Expand All @@ -78,7 +76,7 @@ jobs:
VITE_BOT_SERVICE_URL=https://pr-${{ env.PR_NUMBER }}-state-channel-demo-backend.stg.service.aepps.com
VITE_CLIENT_PORT=8000
VITE_NODE_URL=https://testnet.aeternity.io
VITE_COMPILER_URL=https://compiler.aepps.com
VITE_COMPILER_URL=https://v7.compiler.aepps.com/
VITE_WS_URL=wss://testnet.aeternity.io/channel
VITE_FAUCET_PUBLIC_ADDRESS=ak_2iBPH7HUz3cSDVEUWiHg76MZJ6tZooVNBmmxcgVK6VV8KAE688
VITE_NETWORK_ID=ae_uat
Expand All @@ -96,7 +94,7 @@ jobs:
rm -rf /tmp/.buildx-cache
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
repository: aeternity/gitops-apps-aelabs.git
token: ${{ secrets.BOT_GITHUB_TOKEN }}
Expand All @@ -117,19 +115,19 @@ jobs:
if: github.event_name == 'pull_request' && github.event.action == 'synchronize'
uses: aeternity/ae-github-actions/deploy-status@v7
with:
url: https://pr-${{ env.PR_NUMBER }}-${{ env.APP }}.${{ env.ENV }}.aepps.com
url: https://pr-${{ env.PR_NUMBER }}-${{ env.APP }}.${{ env.ENV }}.service.aepps.com

- name: Staging deploy
if: github.event_name == 'pull_request' && github.event.action == 'opened'
uses: aeternity/ae-github-actions/argocd-deploy@v4
uses: aeternity/ae-github-actions/argocd-deploy@v5
with:
url-prefix: pr-${{ env.PR_NUMBER }}
env: ${{ env.ENV }}
app: ${{ env.APP }}

- name: Staging undeploy
if: github.event_name == 'pull_request' && github.event.action == 'closed' && startsWith(github.head_ref, 'release') != true
uses: aeternity/ae-github-actions/argocd-undeploy@v4
uses: aeternity/ae-github-actions/argocd-undeploy@v5
with:
url-prefix: pr-${{ env.PR_NUMBER }}
env: ${{ env.ENV }}
Expand All @@ -141,7 +139,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
msg: Deployed to https://pr-${{ env.PR_NUMBER }}-${{ env.APP }}.${{ env.ENV }}.aepps.com
msg: Deployed to https://pr-${{ env.PR_NUMBER }}-${{ env.APP }}.${{ env.ENV }}.service.aepps.com
check_for_duplicate_msg: true

- name: Push changes
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
name: State Channel Demo Tests
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 100

Expand All @@ -34,7 +34,7 @@ jobs:
run: cd server && npm ci

- name: Start containers
run: docker-compose up -d --build
run: docker compose up -d --build

- name: List running containers
run: docker ps
Expand Down
Loading

0 comments on commit d9f0052

Please sign in to comment.