Merge branch 'aeternity:main' into main

aeternity · Nov 19, 2024 · 4692a0e · 4692a0e
2 parents 6830daf + 64303fc
commit 4692a0e
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 18 deletions.
diff --git a/.github/workflows/prod-docker-mainnet.yml b/.github/workflows/prod-docker-mainnet.yml
@@ -36,15 +36,15 @@ jobs:
           install: true
 
       - name: Cache Docker layers
-        uses: actions/cache@v2
+        uses: actions/cache@v4.0.2
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-${{ env.ENV }}-buildx-${{ github.sha }}
           restore-keys: |
             ${{ 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 }}
@@ -54,7 +54,7 @@ jobs:
           github.event_name == 'push' ||
           startsWith(github.ref, 'refs/tags/v')
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v5.5.1
         with:
           images: aeternitybot/dex-backend-mainnet
           tags: |
@@ -64,7 +64,7 @@ jobs:
         if: |
           github.event_name == 'push' ||
           startsWith(github.ref, 'refs/tags/v')
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6.7.0
         with:
           context: .
           file: Dockerfile
@@ -80,7 +80,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
           ref: prd

diff --git a/.github/workflows/prod-docker-testnet.yml b/.github/workflows/prod-docker-testnet.yml
@@ -36,15 +36,15 @@ jobs:
           install: true
 
       - name: Cache Docker layers
-        uses: actions/cache@v2
+        uses: actions/cache@v4.0.2
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-${{ env.ENV }}-buildx-${{ github.sha }}
           restore-keys: |
             ${{ 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 }}
@@ -54,7 +54,7 @@ jobs:
           github.event_name == 'push' ||
           startsWith(github.ref, 'refs/tags/v')
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v5.5.1
         with:
           images: aeternitybot/dex-backend-testnet
           tags: |
@@ -64,7 +64,7 @@ jobs:
         if: |
           github.event_name == 'push' ||
           startsWith(github.ref, 'refs/tags/v')
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6.7.0
         with:
           context: .
           file: Dockerfile

diff --git a/.github/workflows/release-please.yaml b/.github/workflows/release-please.yaml
@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Release Please Action
         id: release

diff --git a/.github/workflows/staging-docker-mainnet.yml b/.github/workflows/staging-docker-mainnet.yml
@@ -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
@@ -41,7 +41,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 }}
@@ -66,7 +66,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@v2
+        uses: docker/build-push-action@v6.7.0
         with:
           context: .
           file: Dockerfile
@@ -85,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
           ref: stg
@@ -117,7 +117,7 @@ jobs:
           app: ${{ env.APP }}
 
       - name: Staging undeploy
-        if: github.event_name == 'pull_request' && github.event.action == 'closed' && startsWith(github.head_ref, 'release') != true
+        if: github.event_name == 'pull_request_target' && github.event.action == 'closed' && github.event.pull_request.merged == true && startsWith(github.head_ref, 'release') != true
         uses: aeternity/ae-github-actions/argocd-undeploy@v4
         with:
           url-prefix: pr-${{ env.PR_NUMBER }}

diff --git a/.github/workflows/staging-docker-testnet.yml b/.github/workflows/staging-docker-testnet.yml
@@ -117,7 +117,7 @@ jobs:
           app: ${{ env.APP }}
 
       - name: Staging undeploy
-        if: github.event_name == 'pull_request' && github.event.action == 'closed' && startsWith(github.head_ref, 'release') != true
+        if: github.event_name == 'pull_request_target' && github.event.action == 'closed' && github.event.pull_request.merged == true && startsWith(github.head_ref, 'release') != true
         uses: aeternity/ae-github-actions/argocd-undeploy@v4
         with:
           url-prefix: pr-${{ env.PR_NUMBER }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## [1.5.0](https://www.github.com/aeternity/dex-backend/compare/v1.4.0...v1.5.0) (2024-07-29)
+
+
+### Features
+
+* adds caching to costly endpoints ([1a2d975](https://www.github.com/aeternity/dex-backend/commit/1a2d975fd0ce4670188b786e58e97cb639307302))
+
+
+### Miscellaneous
+
+* adds testnet tokens to listing script ([fcb5fb4](https://www.github.com/aeternity/dex-backend/commit/fcb5fb42c220cfd055b79941090c9c8ea5ca1fa4))
+
 ## [1.4.0](https://www.github.com/aeternity/dex-backend/compare/v1.3.1...v1.4.0) (2024-06-26)
 
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dex-backend",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "",
   "author": "",
   "private": true,