From 84b8b81530d61d30bf8c2e98eea7898384ebf757 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Gonz=C3=A1lez=20Mu=C3=B1oz?= Date: Tue, 19 Sep 2023 11:03:54 +0200 Subject: [PATCH 1/4] replaces Vercel domains with production --- app/pages/_app.tsx | 2 +- app/public/robots.txt | 2 +- app/public/sitemap.xml | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/pages/_app.tsx b/app/pages/_app.tsx index 2013231765..0cdaa669c1 100644 --- a/app/pages/_app.tsx +++ b/app/pages/_app.tsx @@ -89,7 +89,7 @@ const MarxanApp: React.ReactNode = ({ Component, pageProps }: AppProps) => { defaultAutoDismissTime={5000} > - +
- https://marxan.vercel.app/ - 1.0 + https://marxanplanning.org/ + 1.0 2022-31-01 - https://marxan.vercel.app/community + https://marxanplanning.org/community 0.9 2022-31-01 - https://marxan.vercel.app/about + https://marxanplanning.org/about 0.8 2022-31-01 - https://marxan.vercel.app/auth/sign-up + https://marxanplanning.org/auth/sign-up 0.7 2022-31-01 - https://marxan.vercel.app/auth/sign-in + https://marxanplanning.org/auth/sign-in 0.6 2022-31-01 From b4fd3675940f9513d14b6f2e0d36d1feb685e7f8 Mon Sep 17 00:00:00 2001 From: andrea rota Date: Tue, 19 Sep 2023 11:17:19 +0100 Subject: [PATCH 2/4] upgrade fountainhead/action-wait-for-check to v1.1.0 v1.0.0 runs on EOL NodeJS v12; v1.1.0 runs on NodeJS v16. --- .github/workflows/deploy-to-kubernetes.yml | 8 ++++---- .github/workflows/publish-marxan-docker-images.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy-to-kubernetes.yml b/.github/workflows/deploy-to-kubernetes.yml index 454924df33..85c2c807eb 100644 --- a/.github/workflows/deploy-to-kubernetes.yml +++ b/.github/workflows/deploy-to-kubernetes.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Wait for API image to be pushed to Docker Hub - uses: fountainhead/action-wait-for-check@v1.0.0 + uses: fountainhead/action-wait-for-check@v1.1.0 with: token: ${{ secrets.GITHUB_TOKEN }} checkName: Push API Docker image to Azure Container Registry @@ -30,7 +30,7 @@ jobs: intervalSeconds: 30 - name: Wait for Geoprocessing image to be pushed to Docker Hub - uses: fountainhead/action-wait-for-check@v1.0.0 + uses: fountainhead/action-wait-for-check@v1.1.0 with: token: ${{ secrets.GITHUB_TOKEN }} checkName: Push Geoprocessing Docker image to Azure Container Registry @@ -38,7 +38,7 @@ jobs: intervalSeconds: 30 - name: Wait for Client image to be pushed to Docker Hub - uses: fountainhead/action-wait-for-check@v1.0.0 + uses: fountainhead/action-wait-for-check@v1.1.0 with: token: ${{ secrets.GITHUB_TOKEN }} checkName: Push Client Docker image to Docker Hub @@ -46,7 +46,7 @@ jobs: intervalSeconds: 30 - name: Wait for Webshot image to be pushed to Docker Hub - uses: fountainhead/action-wait-for-check@v1.0.0 + uses: fountainhead/action-wait-for-check@v1.1.0 with: token: ${{ secrets.GITHUB_TOKEN }} checkName: Push Webshot Docker image to Azure Container Registry diff --git a/.github/workflows/publish-marxan-docker-images.yml b/.github/workflows/publish-marxan-docker-images.yml index 0789a4ab86..62f137e170 100644 --- a/.github/workflows/publish-marxan-docker-images.yml +++ b/.github/workflows/publish-marxan-docker-images.yml @@ -28,7 +28,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Wait for API tests to run - uses: fountainhead/action-wait-for-check@v1.0.0 + uses: fountainhead/action-wait-for-check@v1.1.0 with: token: ${{ secrets.GITHUB_TOKEN }} checkName: API Tests @@ -36,7 +36,7 @@ jobs: intervalSeconds: 20 - name: Wait for Client tests to run - uses: fountainhead/action-wait-for-check@v1.0.0 + uses: fountainhead/action-wait-for-check@v1.1.0 with: token: ${{ secrets.GITHUB_TOKEN }} checkName: Client Tests From fac03feb858fdcb9cffb2bd153ef009970d0d5ef Mon Sep 17 00:00:00 2001 From: andrea rota Date: Tue, 19 Sep 2023 11:24:30 +0100 Subject: [PATCH 3/4] install kubectl from current pkgs.k8s.io deb repository Using v1.25 as cluster is currently on v1.24 and we can rely on a +1/-1 drift (aka we can upgrade the cluster up to v1.26 while keeping kubectl functional in GH actions). --- .github/workflows/deploy-to-kubernetes.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-to-kubernetes.yml b/.github/workflows/deploy-to-kubernetes.yml index 85c2c807eb..7af04091b3 100644 --- a/.github/workflows/deploy-to-kubernetes.yml +++ b/.github/workflows/deploy-to-kubernetes.yml @@ -82,8 +82,8 @@ jobs: - name: Install kubectl run: | - sudo curl -fsSLo /usr/share/keyrings/kubernetes-archive-keyring.gpg https://packages.cloud.google.com/apt/doc/apt-key.gpg - echo "deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https://apt.kubernetes.io/ kubernetes-xenial main" | sudo tee /etc/apt/sources.list.d/kubernetes.list + sudo curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.28/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg + echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.25/deb/ /' | sudo tee /etc/apt/sources.list.d/kubernetes.list sudo apt-get update sudo apt-get install -y kubectl From 23e5a6e517a48bd380eb5019a96061ae4d5b4738 Mon Sep 17 00:00:00 2001 From: andrea rota Date: Tue, 19 Sep 2023 11:29:57 +0100 Subject: [PATCH 4/4] replace leftover use of set-output in GH actions workflow --- .github/workflows/cypress.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index 43f91906d3..d524231894 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -28,7 +28,7 @@ jobs: - name: Get yarn cache directory path id: yarn-cache-dir-path - run: echo "::set-output name=dir::$(yarn cache dir)" + run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT - name: Yarn cache uses: actions/cache@v2