From a1b09feb2352a75dda1fbe4ceb884012ca1c764d Mon Sep 17 00:00:00 2001 From: Scott Goodrow Date: Thu, 18 Jul 2024 15:49:53 -0700 Subject: [PATCH 1/6] fix: tests in ci --- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 2 ++ .nvmrc | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 .nvmrc diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 58e52571..03185d3e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,5 +23,5 @@ jobs: - uses: dokku/github-action@v1.4.0 with: branch: main - git_remote_url: 'ssh://dokku@172.105.106.208/castle-discord-bot' + git_remote_url: "ssh://dokku@172.105.106.208/castle-discord-bot" ssh_private_key: ${{ secrets.DOKKU_PRIVATE_KEY }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 48a243b0..d017435a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,6 +18,8 @@ jobs: node-version: 20 cache: yarn cache-dependency-path: yarn.lock + - run: nvm install + - run: nvm use - run: yarn install - run: yarn test:ci - run: yarn tsc diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 00000000..95af4712 --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +22.2 From a0fa9883fc8b40c39cdac070544480ca845d9856 Mon Sep 17 00:00:00 2001 From: Scott Goodrow Date: Thu, 18 Jul 2024 15:51:35 -0700 Subject: [PATCH 2/6] Revert "Revert "Update officer app per vote (#122)" (#123)" This reverts commit 5bb9e765fa01de52e6cf31d4445354ffc4d083ad. --- src/features/applications/config.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/features/applications/config.ts b/src/features/applications/config.ts index 477d2d70..7082c4e9 100644 --- a/src/features/applications/config.ts +++ b/src/features/applications/config.ts @@ -5,11 +5,11 @@ const officerApplicationCommand = new RequestApplication( "running the guild", "any officer", [ - "Please describe what motivates you to volunteer as an officer.", - "Officers set an example for the other members of the guild. This includes moderating our habits of speech in guild chat and refraining from trash-talking even when others are rude. We must know the server rules inside and out and follow them. Our behavior reflects directly upon Castle. Are you willing to hold yourself to the highest standards of decorum even and to take responsibility for the consequences of your decisions as an officer?", - "While we are allowed to play the game and not be on-duty all the time, being an Officer will consume time. Are you willing to dedicate some of your time to being an Officer of Castle? And do you have the wisdom to set aside time for yourself to enjoy the game?", - "The complaints and reports we receive are sometimes genuine and sometimes frivolous and false. We need people who will endure the discomfort of dealing diplomatically with reports and be willing to have honest talks with members, mostly 30-to-60-year-old adults, about their misbehavior in a video game. Do you have the maturity to maintain your composure and behave professionally?", - "Include a list with the name of all your characters that are tagged in the alliance. Once you have filled out this application and created the list please DM this to an officer.", + "Please elaborate on the specific factors that drive your interest in volunteering as an officer. What personal motivations or experiences have influenced your decision to take on this role? Additionally, can you describe the particular areas or aspects of the guild where you believe you could make the most significant contribution as an officer? How do you envision your role enhancing the guild's overall experience and success?", + "Officers are expected to set a strong example for the rest of the guild, including moderating our language in guild chat and avoiding any form of trash-talking, even in response to rudeness from others. You must be well-versed in the server rules and consistently adhere to them. Can you elaborate on how you plan to uphold these standards of decorum and take responsibility for the impact of your actions as an officer? How would you handle a situation where your decisions might reflect poorly on the guild?", + "While it’s understood that officers are not required to be on-duty at all times, the role will inevitably require a significant time commitment. Could you describe how you intend to balance your responsibilities as an officer with your personal time and enjoyment of the game? How do you plan to manage your time effectively to ensure you can fulfill your officer duties without compromising your own gaming experience?", + "Handling complaints and reports involves navigating both genuine concerns and potentially frivolous or false claims. This role requires dealing diplomatically with reports and engaging in honest discussions with members, many of whom are adults aged 30 to 60, about their behavior. Can you provide examples or describe situations where you’ve demonstrated the maturity and professionalism required for this task? How would you approach a situation where you need to address serious behavioral issues diplomatically?", + "Please provide a detailed list of all your characters that are tagged in the alliance. After completing this application and compiling your character list, please send it via direct message to an officer.", ], "current officers. Each applicant must be approved by 3 current officers and not be opposed by any" ); From 093a63bfa4c77effa76f837347567b83ccb68e53 Mon Sep 17 00:00:00 2001 From: Scott Goodrow Date: Thu, 18 Jul 2024 15:56:22 -0700 Subject: [PATCH 3/6] better fix --- .github/workflows/test.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d017435a..d8a07ea6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,11 +15,9 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: 20 + node-version: 22.2 cache: yarn cache-dependency-path: yarn.lock - - run: nvm install - - run: nvm use - run: yarn install - run: yarn test:ci - run: yarn tsc From 042958d619cbebd62104153e796e2ff4fb5c4259 Mon Sep 17 00:00:00 2001 From: Scott Goodrow Date: Thu, 18 Jul 2024 15:59:08 -0700 Subject: [PATCH 4/6] maybe this? --- .github/workflows/test.yml | 2 +- .nvmrc | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d8a07ea6..58c8ea0f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: 22.2 + node-version: 22 cache: yarn cache-dependency-path: yarn.lock - run: yarn install diff --git a/.nvmrc b/.nvmrc index 95af4712..2bd5a0a9 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -22.2 +22 diff --git a/package.json b/package.json index dde78c9f..214f360d 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "test:ci": "jest" }, "engines": { - "node": "22.2.0" + "node": "^22" }, "dependencies": { "@discordjs/builders": "^0.12.0", From 5f008cfc0b0712e7509cd241848f181edee07bed Mon Sep 17 00:00:00 2001 From: Scott Goodrow Date: Thu, 18 Jul 2024 16:10:33 -0700 Subject: [PATCH 5/6] try 20 --- .github/workflows/test.yml | 2 +- .nvmrc | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 58c8ea0f..59f55f1c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: 22 + node-version: "20" cache: yarn cache-dependency-path: yarn.lock - run: yarn install diff --git a/.nvmrc b/.nvmrc index 2bd5a0a9..209e3ef4 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -22 +20 diff --git a/package.json b/package.json index 214f360d..f1105c76 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "test:ci": "jest" }, "engines": { - "node": "^22" + "node": "^20" }, "dependencies": { "@discordjs/builders": "^0.12.0", From 2f82599242726b2293214ff3226a51aaf7ad6982 Mon Sep 17 00:00:00 2001 From: Scott Goodrow Date: Thu, 18 Jul 2024 16:17:08 -0700 Subject: [PATCH 6/6] fix --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 59f55f1c..48a243b0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: "20" + node-version: 20 cache: yarn cache-dependency-path: yarn.lock - run: yarn install