merge to release (#183)

nam20485 · Jan 31, 2024 · e4cf978 · e4cf978
2 parents 2a2bc3b + db9e912
commit e4cf978
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 16 deletions.
diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml
@@ -211,4 +211,4 @@ jobs:
       with:
         name: ${{ matrix.os }}-artifacts
         path: ${{ env.ARTIFACTS_DIR }}/artifacts-${{matrix.os}}.zip
-        retention-days: 1
+        retention-days: 365 # 1 year
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -29,11 +29,18 @@ jobs:
           - name: Checkout Repository
             uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
-          # download the artifacts
-          - name: "Download artifacts"
-            uses: "actions/download-artifact@6b208ae046db98c579e8a3aa621ab581ff575935" # v4.1.1
+        #   # download the artifacts
+        #   - name: "Download artifacts"
+        #     uses: "actions/download-artifact@6b208ae046db98c579e8a3aa621ab581ff575935" # v4.1.1
+        #     with:
+        #       path: ${{ github.workspace }}/artifacts     
+
+          - name: Download Artifacts
+            uses: dawidd6/[email protected]
             with:
-              path: ${{ github.workspace }}/artifacts     
+              workflow: cmake-multi-platform.yml
+              workflow_conclusion: success
+              path: ${{ github.workspace }}/artifacts              
 
           - name: Rename Artifacts
             run: |

diff --git a/.github/workflows/deploy-eks.yml b/.github/workflows/deploy-eks.yml
@@ -24,29 +24,24 @@
 #    See the documentation for each action used below for the recommended IAM policies for this IAM user,
 #    and best practices on handling the access key credentials.
 
-name: Deploy to Amazon ECS
+name: Deploy to Amazon EKS
 
 on:
   push:
-    branches: [ "development" ]
+    branches: [ "release" ]
 
 env:
-  AWS_REGION: MY_AWS_REGION                   # set this to your preferred AWS region, e.g. us-west-1
-  ECR_REPOSITORY: MY_ECR_REPOSITORY           # set this to your Amazon ECR repository name
-  ECS_SERVICE: MY_ECS_SERVICE                 # set this to your Amazon ECS service name
-  ECS_CLUSTER: MY_ECS_CLUSTER                 # set this to your Amazon ECS cluster name
-  ECS_TASK_DEFINITION: MY_ECS_TASK_DEFINITION # set this to the path to your Amazon ECS task definition
-                                               # file, e.g. .aws/task-definition.json
-  CONTAINER_NAME: MY_CONTAINER_NAME           # set this to the name of the container in the
-                                               # containerDefinitions section of your task definition
+  AWS_REGION: us-west-2                   # set this to your preferred AWS region, e.g. us-west-1\                                             # file, e.g. .aws/task-definition.json
+  CONTAINER_NAME: MY_CONTAINER_NAME       # set this to the name of the container in the
+                                          # containerDefinitions section of your task definition
 
 permissions:
   contents: read
 
 jobs:
   deploy:
     name: Deploy
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     environment: production
 
     steps:

diff --git a/.gitignore b/.gitignore
@@ -44,3 +44,4 @@ OdbDesignServer/PyOdbDesignLib/PyOdbDesignLib.py
 OdbDesignServer/db.sqlite3
 OdbDesignServer/PyOdbDesignLib/_PyOdbDesignLib.pyd
 /TEST_DATA.zip
+deploy/kubeconfig