diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index bfa9d205..00000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,23 +0,0 @@ -version: 2 -jobs: - deploy: - docker: - - image: cimg/base:2020.01 - steps: - - run: - name: Deploy - command: | - ssh -o StrictHostKeyChecking=no root@$GOWON_HOST_IP "cd ./gowon && /bin/bash ./deploy.sh" - -workflows: - version: 2 - deploy: - jobs: - - approve: - type: approval - - - deploy: - context: - - gowon - requires: - - approve diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 00000000..9519a892 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,18 @@ +name: Deploy Gowon +run-name: ${{ github.actor }} is deploying Gowon +on: + push: + branches: + - main +jobs: + Deploy: + runs-on: ubuntu-latest + environment: production + steps: + - name: executing remote ssh commands using ssh key + uses: appleboy/ssh-action@v1.0.0 + with: + host: ${{ secrets.GOWON_HOST_IP }} + username: ${{ secrets.GOWON_HOST_USERNAME }} + key: ${{ secrets.SSH_KEY }} + script: cd ./gowon && /bin/bash ./deploy.sh diff --git a/.vscode/settings.json b/.vscode/settings.json index 0b590249..ca45152e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,5 +3,8 @@ "editor.formatOnPaste": false, "editor.formatOnType": false, "editor.formatOnSaveMode": "file", - "editor.defaultFormatter": "rvest.vs-code-prettier-eslint" + "editor.defaultFormatter": "rvest.vs-code-prettier-eslint", + "yaml.schemas": { + "https://json.schemastore.org/github-workflow.json": ".github/workflows/deploy.yml" + } } diff --git a/deploy.sh b/deploy.sh index 46af3fbe..03f4063a 100644 --- a/deploy.sh +++ b/deploy.sh @@ -1,4 +1,4 @@ git pull -docker-compose build -docker-compose up -d \ No newline at end of file +docker compose build +docker compose up -d \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 739e9714..0ab975fa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,14 +3,6 @@ version: "3.9" services: gowon: build: . - extra_hosts: - - "host.docker.internal:host-gateway" - depends_on: - - mirrorball - - lilac - - mirrorball: - image: mirrorball extra_hosts: - "host.docker.internal:host-gateway" depends_on: @@ -19,8 +11,4 @@ services: redis: image: "redis:alpine" - lilac: - image: lilac - extra_hosts: - - "host.docker.internal:host-gateway" - restart: on-failure + diff --git a/src/commands/Fishy/Collection.ts b/src/commands/Fishy/Collection.ts index f23e7889..cce01e1d 100644 --- a/src/commands/Fishy/Collection.ts +++ b/src/commands/Fishy/Collection.ts @@ -50,7 +50,9 @@ export class Collection extends FishyChildCommand { pageSize: 15, pageRenderer(items, { offset }) { return ( - `_${displayFishyCollectionProgress(collection)}fishy collected_\n\n` + + `_${displayFishyCollectionProgress( + collection + )} fishy collected_\n\n` + displayNumberedList( items.map((f) => { const owned = collection.includes(f.id);