From 6184eccf64c29b034c4d6d50263ce2adec96454b Mon Sep 17 00:00:00 2001 From: Nathan Miller Date: Wed, 31 Jan 2024 08:37:43 -0800 Subject: [PATCH 1/4] use different artifact download path to download artifacts from a different workflow --- .github/workflows/create-release.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index d8fe951b..7bee0ada 100644 --- 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/action-download-artifact@v3.0.0 with: - path: ${{ github.workspace }}/artifacts + workflow: cmake-multi-platform.yml + workflow_conclusion: success + path: ${{ github.workspace }}/artifacts - name: Rename Artifacts run: | From 018c4a818e027bc9a258fd8cfff64033dcca1030 Mon Sep 17 00:00:00 2001 From: Nathan Miller Date: Wed, 31 Jan 2024 08:38:52 -0800 Subject: [PATCH 2/4] increase artifact retention days --- .github/workflows/cmake-multi-platform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 09e88f31..ea553934 100644 --- 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 From 35a745f335858bd1c1bbe7d43b40897dcf7a2f26 Mon Sep 17 00:00:00 2001 From: Nathan Miller Date: Wed, 31 Jan 2024 08:39:10 -0800 Subject: [PATCH 3/4] run deploy workflow on release branch pushes --- .github/workflows/deploy-eks.yml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/deploy-eks.yml b/.github/workflows/deploy-eks.yml index 086912e5..6bd14fe7 100644 --- a/.github/workflows/deploy-eks.yml +++ b/.github/workflows/deploy-eks.yml @@ -24,21 +24,16 @@ # 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 @@ -46,7 +41,7 @@ permissions: jobs: deploy: name: Deploy - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 environment: production steps: From a469948ec5c304619e3eb144415b31d80cd9ad8e Mon Sep 17 00:00:00 2001 From: Nathan Miller Date: Wed, 31 Jan 2024 12:38:21 -0800 Subject: [PATCH 4/4] ignore deploy kubeconfig --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 8545b108..0bc7f5f5 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ OdbDesignServer/PyOdbDesignLib/PyOdbDesignLib.py OdbDesignServer/db.sqlite3 OdbDesignServer/PyOdbDesignLib/_PyOdbDesignLib.pyd /TEST_DATA.zip +deploy/kubeconfig