From 036b843d06d63f9e7483ab7d48ea83d499049415 Mon Sep 17 00:00:00 2001 From: "antony.bailey@thepoliceoftheinter.net" Date: Tue, 26 Mar 2024 15:14:48 +0000 Subject: [PATCH 1/4] Mode to org --- .github/workflows/docker.yml | 2 +- CODEOWNERS | 7 +++++++ LICENSE | 2 +- README.MD | 2 +- deploy/terraform/variables.tf | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 CODEOWNERS diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index bfa955d..1defbdb 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -13,7 +13,7 @@ jobs: env: BUILD_DATE: ${{ github.event.head_commit.timestamp }} IMAGE_NAME: hammy-mchamilton - REPO_OWNER: parttimelegend + REPO_OWNER: hamhangout steps: - name: Checkout code diff --git a/CODEOWNERS b/CODEOWNERS new file mode 100644 index 0000000..b2b0b48 --- /dev/null +++ b/CODEOWNERS @@ -0,0 +1,7 @@ +*.md @HamHangOut/Documentation +docs/* @HamHangOut/Documentation +.github/workflows/* @HamHangOut/Developers/Github +.github/FUNDING.yml @HamHangOut/Admins +* @HamHangOut/Developers +*.py @HamHangOut/Developers/Python +requirements.txt @HamHangOut/Developers/Python diff --git a/LICENSE b/LICENSE index aa2fbac..cf0d3c1 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2024 Joshua Clarke and Antony Bailey +Copyright (c) 2024 Ham Hang Out Developers and Contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.MD b/README.MD index 485321f..3a0d192 100644 --- a/README.MD +++ b/README.MD @@ -16,7 +16,7 @@ This is a Discord bot written in Python that hosts a quiz game with questions an 1. Clone this repository to your local machine: ```bash - git clone https://github.com/parttimelegend/hammy-mchamilton.git + git clone https://github.com/HamHangOut/hammy-mchamilton.git ``` 2. Navigate to the project directory: diff --git a/deploy/terraform/variables.tf b/deploy/terraform/variables.tf index 41d7dcf..ae0bd33 100644 --- a/deploy/terraform/variables.tf +++ b/deploy/terraform/variables.tf @@ -23,7 +23,7 @@ variable "app_name" { variable "container" { type = string - default = "parttimelegend/hammy-mchamilton:latest" + default = "HamHangOut/hammy-mchamilton:latest" description = "Container name" } From 0a14d958c3cafc8e9d927ced31f6ac681c09cdc7 Mon Sep 17 00:00:00 2001 From: "antony.bailey@thepoliceoftheinter.net" Date: Tue, 26 Mar 2024 15:22:40 +0000 Subject: [PATCH 2/4] CO --- CODEOWNERS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index b2b0b48..cba4d50 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,7 +1,7 @@ *.md @HamHangOut/Documentation docs/* @HamHangOut/Documentation -.github/workflows/* @HamHangOut/Developers/Github +.github/workflows/* @HamHangOut/Github .github/FUNDING.yml @HamHangOut/Admins * @HamHangOut/Developers -*.py @HamHangOut/Developers/Python -requirements.txt @HamHangOut/Developers/Python +*.py @HamHangOut/Python +requirements.txt @HamHangOut/Python From 32463c60930a5b28be3306aeda2389b758a6c753 Mon Sep 17 00:00:00 2001 From: "antony.bailey@thepoliceoftheinter.net" Date: Tue, 26 Mar 2024 15:32:00 +0000 Subject: [PATCH 3/4] CC --- README.MD | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.MD b/README.MD index 3a0d192..29c0c3b 100644 --- a/README.MD +++ b/README.MD @@ -1,5 +1,7 @@ # Hammy McHamilton Discord Quiz Bot +[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](code_of_conduct.md) + This is a Discord bot written in Python that hosts a quiz game with questions and answers on from the RSGB Amateur Radio Examination questions list. The bot randomly selects questions from a predefined quiz data set and prompts users to answer them within a specified time limit. ![.... --- .-- / -.. --- . ... / .- / -... .- ... - .- .-. -.. --..-- / --- .-. .--. .... .- -. --..-- / ... --- -. / --- ..-. / .- / .-- .... --- .-. . / .- -. -.. / .- / ... -.-. --- - ... -- .- -. --..-- / -.. .-. --- .--. .--. . -.. / .. -. / - .... . / -- .. -.. -.. .-.. . / --- ..-. / .- / ..-. --- .-. --. --- - - . -. / ... .--. --- - / .. -. / - .... . / -.-. .- .-. .. -... -... . .- -. / -... -.-- / .--. .-. --- ...- .. -.. . -. -.-. . --..-- / .. -- .--. --- ...- . .-. .. ... .... . -.. --..-- / .. -. / ... --.- ..- .- .-.. --- .-. / --. .-. --- .-- / ..- .--. / - --- / -... . / .- / .... . .-. --- / .- -. -.. / .- / ... -.-. .... --- .-.. .- .-. ..--..](docs/hammy.jpg?raw=true "Hammy McHamilton") From a2b347fd2f8e6e2c9203850a6aaa0177582177be Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 26 Mar 2024 15:32:21 +0000 Subject: [PATCH 4/4] terraform-docs: automated action --- deploy/terraform/README.MD | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/deploy/terraform/README.MD b/deploy/terraform/README.MD index db64b45..80dc562 100644 --- a/deploy/terraform/README.MD +++ b/deploy/terraform/README.MD @@ -32,15 +32,15 @@ No requirements. | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| -| [app\_name](#input\_app\_name) | n/a | `string` | `"hammy"` | no | -| [app\_service\_sku\_name](#input\_app\_service\_sku\_name) | n/a | `string` | `"P1v2"` | no | -| [container](#input\_container) | n/a | `string` | `"parttimelegend/hammy-mchamilton:latest"` | no | -| [container\_registry](#input\_container\_registry) | n/a | `string` | `"https://ghcr.io"` | no | -| [discord\_token](#input\_discord\_token) | n/a | `string` | n/a | yes | -| [environment](#input\_environment) | n/a | `string` | n/a | yes | -| [keyvault\_sku\_name](#input\_keyvault\_sku\_name) | n/a | `string` | `"standard"` | no | -| [location](#input\_location) | n/a | `string` | `"UK South"` | no | -| [os\_type](#input\_os\_type) | n/a | `string` | `"Linux"` | no | +| [app\_name](#input\_app\_name) | The app name to use. | `string` | `"hammy"` | no | +| [app\_service\_sku\_name](#input\_app\_service\_sku\_name) | The sku to use for the app service | `string` | `"P1v2"` | no | +| [container](#input\_container) | Container name | `string` | `"HamHangOut/hammy-mchamilton:latest"` | no | +| [container\_registry](#input\_container\_registry) | Container registry URL | `string` | `"https://ghcr.io"` | no | +| [discord\_token](#input\_discord\_token) | n/a | `string` | `"Discord oauth2 token. SENSITIVE."` | no | +| [environment](#input\_environment) | The environment to deploy this app service to e.g., dev, test, staging, prod. | `string` | n/a | yes | +| [keyvault\_sku\_name](#input\_keyvault\_sku\_name) | The SKU to use for the KeyVault | `string` | `"standard"` | no | +| [location](#input\_location) | The Azure location for deploying this this application to. | `string` | `"UK South"` | no | +| [os\_type](#input\_os\_type) | OS Type (Windows / Linux) | `string` | `"Linux"` | no | ## Outputs