From e9c05d3b7349f65a653638108993644c4a022fd0 Mon Sep 17 00:00:00 2001 From: Nicolas Sanchez Date: Thu, 23 Jan 2025 13:51:48 -0300 Subject: [PATCH 1/5] Add Makefile commands to setup infra --- Makefile | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/Makefile b/Makefile index 31c6597ee..25951668c 100644 --- a/Makefile +++ b/Makefile @@ -68,3 +68,28 @@ generate-bot-manager-protos: --elixir_opt=package_prefix=bot_manager.protobuf \ --proto_path=apps/serialization \ messages.proto + +## INFRA +## Run this as admin +debian-install-deps: + sudo apt update -y + sudo apt install -y rsync libssl-dev libncurses5 libsctp1 wget systemd-timesyncd + wget -P /tmp/ http://ftp.de.debian.org/debian/pool/main/o/openssl/libssl1.1_1.1.1w-0+deb11u1_amd64.deb + sudo dpkg -i /tmp/libssl1.1_1.1.1w-0+deb11u1_amd64.deb + rm /tmp/libssl1.1_1.1.1w-0+deb11u1_amd64.deb + wget -P /tmp/ https://binaries2.erlang-solutions.com/debian/pool/contrib/e/esl-erlang/esl-erlang_26.2.3-1~debian~buster_amd64.deb + sudo dpkg -i /tmp/esl-erlang_26.2.3-1~debian~buster_amd64.deb + rm /tmp/esl-erlang_26.2.3-1~debian~buster_amd64.deb + wget -P /tmp/ https://github.com/elixir-lang/elixir/releases/download/v1.16.3/elixir-otp-26.zip + sudo unzip -d /usr/ /tmp/elixir-otp-26.zip + rm /tmp/elixir-otp-26.zip + +write-caddyfile: + @read -p "Enter the server dns (e.g: 'arena-testing.championsofmirra.com'): " user_input; \ + sudo sed -i "1i $$user_input {" /etc/caddy/Caddyfile; \ + sudo sed -i "2i \ reverse_proxy localhost:4000" /etc/caddy/Caddyfile; \ + sudo sed -i "3i }" /etc/caddy/Caddyfile; + +## Run this as dev +debian-install-dev-deps: + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y From c4faa6118503674e235d2480caf7619db662a971 Mon Sep 17 00:00:00 2001 From: Nicolas Sanchez Date: Thu, 23 Jan 2025 13:59:00 -0300 Subject: [PATCH 2/5] Add new chile arena testing deploy replacing legacy brazil one --- ...loy.yml => arena-chile-testing-deploy.yml} | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) rename .github/workflows/{arena-brazil-testing-aws-deploy.yml => arena-chile-testing-deploy.yml} (81%) diff --git a/.github/workflows/arena-brazil-testing-aws-deploy.yml b/.github/workflows/arena-chile-testing-deploy.yml similarity index 81% rename from .github/workflows/arena-brazil-testing-aws-deploy.yml rename to .github/workflows/arena-chile-testing-deploy.yml index e3435eb71..1acae4fa2 100644 --- a/.github/workflows/arena-brazil-testing-aws-deploy.yml +++ b/.github/workflows/arena-chile-testing-deploy.yml @@ -1,14 +1,14 @@ -name: "[TESTING-BRAZIL] Deploy to Brazil Arena Testing AWS" +name: "[TESTING-CHILE] Deploy to Chile Arena Testing" on: workflow_dispatch: jobs: build-deploy: - name: Build and deploy to Brazil staging + name: Build and deploy to Chile testing runs-on: ubuntu-22.04 environment: - name: testing-brazil - url: https://arena-brazil-testing-aws.championsofmirra.com/ + name: testing-chile + url: https://arena-chile-testing.championsofmirra.com/ steps: - uses: actions/checkout@v4 @@ -22,7 +22,7 @@ jobs: - name: Add host keys env: - SSH_HOST: ${{ vars.AWS_TS_ARENA_HOST }} + SSH_HOST: ${{ vars.TS_ARENA_HOST }} run: | set -ex mkdir -p ~/.ssh/ @@ -31,29 +31,29 @@ jobs: - name: Copy deploy script env: SSH_USERNAME: ${{ vars.SSH_USERNAME }} - SSH_HOST: ${{ vars.AWS_TS_ARENA_HOST }} + SSH_HOST: ${{ vars.TS_ARENA_HOST }} run: | set -ex rsync -avz --mkpath devops/deploy.sh ${SSH_USERNAME}@${SSH_HOST}:/home/${SSH_USERNAME}/deploy-script/ - name: Execute deploy script env: - SSH_HOST: ${{ vars.AWS_TS_ARENA_HOST }} + SSH_HOST: ${{ vars.TS_ARENA_HOST }} SSH_USERNAME: ${{ vars.SSH_USERNAME }} MIX_ENV: ${{ vars.MIX_ENV }} RELEASE: arena PHX_SERVER: ${{ vars.PHX_SERVER }} - PHX_HOST: ${{ vars.AWS_HOST }} + PHX_HOST: ${{ vars.HOST }} PORT: ${{ vars.ARENA_PORT }} GATEWAY_URL: ${{ vars.GATEWAY_URL }} BOT_MANAGER_PORT: ${{ vars.BOT_MANAGER_PORT }} BOT_MANAGER_HOST: ${{ vars.BOT_MANAGER_HOST }} DATABASE_URL: ${{ secrets.DATABASE_URL }} SECRET_KEY_BASE: ${{ secrets.SECRET_KEY_BASE }} - NEWRELIC_APP_NAME: ${{ vars.NEWRELIC_APP_NAME_AWS }} + NEWRELIC_APP_NAME: ${{ vars.NEWRELIC_APP_NAME }} NEWRELIC_KEY: ${{ secrets.NEWRELIC_KEY }} - DBUS_SESSION_BUS_ADDRESS: ${{ vars.DBUS_SESSION_BUS_ADDRESS_AWS }} - XDG_RUNTIME_DIR: ${{ vars.XDG_RUNTIME_DIR_AWS }} + DBUS_SESSION_BUS_ADDRESS: ${{ vars.DBUS_SESSION_BUS_ADDRESS }} + XDG_RUNTIME_DIR: ${{ vars.XDG_RUNTIME_DIR }} BRANCH_NAME: ${{ github.head_ref || github.ref_name }} run: | set -ex From 14af90fb2b15a3e9eb64f79f65ab0da9839db041 Mon Sep 17 00:00:00 2001 From: Nicolas Sanchez Date: Thu, 23 Jan 2025 14:03:34 -0300 Subject: [PATCH 3/5] Add on-push trigger for testing purposes --- .github/workflows/arena-chile-testing-deploy.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/arena-chile-testing-deploy.yml b/.github/workflows/arena-chile-testing-deploy.yml index 1acae4fa2..83721ce85 100644 --- a/.github/workflows/arena-chile-testing-deploy.yml +++ b/.github/workflows/arena-chile-testing-deploy.yml @@ -1,5 +1,8 @@ name: "[TESTING-CHILE] Deploy to Chile Arena Testing" on: + push: + branches: + - add-new-chile-testing-workflow workflow_dispatch: jobs: From f3612c0759c359e422e54abdb6c741315b42b01d Mon Sep 17 00:00:00 2001 From: Nicolas Sanchez Date: Thu, 23 Jan 2025 14:26:52 -0300 Subject: [PATCH 4/5] Add caddy restart on makefile command --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 25951668c..a5f83a3fd 100644 --- a/Makefile +++ b/Makefile @@ -70,7 +70,7 @@ generate-bot-manager-protos: messages.proto ## INFRA -## Run this as admin +## Run these as admin debian-install-deps: sudo apt update -y sudo apt install -y rsync libssl-dev libncurses5 libsctp1 wget systemd-timesyncd @@ -84,11 +84,12 @@ debian-install-deps: sudo unzip -d /usr/ /tmp/elixir-otp-26.zip rm /tmp/elixir-otp-26.zip -write-caddyfile: +setup-caddy: @read -p "Enter the server dns (e.g: 'arena-testing.championsofmirra.com'): " user_input; \ sudo sed -i "1i $$user_input {" /etc/caddy/Caddyfile; \ sudo sed -i "2i \ reverse_proxy localhost:4000" /etc/caddy/Caddyfile; \ sudo sed -i "3i }" /etc/caddy/Caddyfile; + sudo systemctl restart caddy ## Run this as dev debian-install-dev-deps: From d90e5221a8f3603784db359a5496237539866988 Mon Sep 17 00:00:00 2001 From: Nicolas Sanchez Date: Thu, 23 Jan 2025 14:27:13 -0300 Subject: [PATCH 5/5] Delete on-push trigger --- .github/workflows/arena-chile-testing-deploy.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/arena-chile-testing-deploy.yml b/.github/workflows/arena-chile-testing-deploy.yml index 83721ce85..1acae4fa2 100644 --- a/.github/workflows/arena-chile-testing-deploy.yml +++ b/.github/workflows/arena-chile-testing-deploy.yml @@ -1,8 +1,5 @@ name: "[TESTING-CHILE] Deploy to Chile Arena Testing" on: - push: - branches: - - add-new-chile-testing-workflow workflow_dispatch: jobs: