From 090e70e3b6e1ea0324209e72f3ad6865e59a5a3a Mon Sep 17 00:00:00 2001 From: Selis Date: Fri, 1 Jul 2022 09:42:47 +0200 Subject: [PATCH 01/24] Create map_report.md --- .github/ISSUE_TEMPLATE/map_report.md | 29 ++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/map_report.md diff --git a/.github/ISSUE_TEMPLATE/map_report.md b/.github/ISSUE_TEMPLATE/map_report.md new file mode 100644 index 00000000000..a3aa174357f --- /dev/null +++ b/.github/ISSUE_TEMPLATE/map_report.md @@ -0,0 +1,29 @@ +--- +name: Map Bug report +about: Create a report, specific to any map related things. +title: '[MAPPING] ' +labels: ['Type: Bug', 'Type: Map'] +assignees: '' + +--- + + + + + + +#### Brief description of the bug + + +#### What you expected to happen + + +#### What actually happened + + +#### Code Revision +- (Found using the "Show Server Revision" verb under the OOC tab.) + + +#### Anything else you may wish to add: +- (Location if it's a mapping issue, screenshots, sprites, etc.) From 84801f5f72838f62b272822e76c05238d8a97e0c Mon Sep 17 00:00:00 2001 From: ItsSelis Date: Fri, 1 Jul 2022 23:33:13 +0200 Subject: [PATCH 02/24] Compile all those maps! Lets see if this works. Proper indent Fixed variable Job dependency Using cache and tgui linters (if labeled) Formatting fix --- .github/workflows/ci.yml | 43 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index deea08a9751..7648fbfa08b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,6 +37,17 @@ jobs: key: ${{ runner.os }}-dreamchecker-${{ hashFiles('dependencies.sh')}} restore-keys: ${{ runner.os }}-dreamchecker + - name: Restore Yarn cache + if: ${{ contains(github.event.pull_request.labels.*.name, 'Type: TGUI Bundle') }} + uses: actions/cache@v3 + with: + path: tgui/.yarn/cache + key: ${{ runner.os }}-yarn-${{ secrets.CACHE_PURGE_KEY }}-${{ hashFiles('tgui/yarn.lock') }} + restore-keys: | + ${{ runner.os }}-build-${{ secrets.CACHE_PURGE_KEY }}- + ${{ runner.os }}-build- + ${{ runner.os }}- + - name: Install Dependencies run: | tools/ci/install_spaceman_dmm.sh dreamchecker @@ -46,6 +57,16 @@ jobs: run: | ~/dreamchecker > ${GITHUB_WORKSPACE}/output-annotations.txt 2>&1 + - name: TGUI Linters + if: ${{ contains(github.event.pull_request.labels.*.name, 'Type: TGUI Bundle') }} + run: | + cd tgui + yarn install + yarn tgui:prettier + yarn run tsc + yarn run eslint packages --ext ".js,.cjs,.ts,.tsx" @Args + cd .. + - name: Annotate Linter uses: yogstation13/DreamAnnotate@v1 if: always() @@ -79,7 +100,25 @@ jobs: TEST_DEFINE: "UNIT_TEST" TEST_FILE: "code/_unit_tests.dm" RUN: "1" - - name: Compile POIs (no run) + + map_tests: + needs: unit_tests + name: Map Tests + runs-on: ubuntu-latest + strategy: + matrix: + map: ['tether', 'stellardelight', 'groundbase'] + steps: + - uses: actions/checkout@v3 + - name: Ensure +x on CI directory + run: | + chmod -R +x ./tools/ci + - name: Setup Cache + uses: actions/cache@v3 + with: + path: $HOME/BYOND + key: ${{ runner.os }}-byond + - name: Compile POIs (${{ matrix.map }}) run: | tools/ci/install_byond.sh tools/ci/compile_and_run.sh @@ -87,7 +126,7 @@ jobs: TEST_DEFINE: "MAP_TEST" TEST_FILE: "code/_map_tests.dm" RUN: "0" - - name: Compile away missions (no run) + - name: Compile away missions (${{ matrix.map }}) run: | tools/ci/install_byond.sh tools/ci/compile_and_run.sh From f502e8a2eda234f1eff1bf5e574d525021182b82 Mon Sep 17 00:00:00 2001 From: ItsSelis Date: Fri, 1 Jul 2022 23:34:02 +0200 Subject: [PATCH 03/24] Added missing quotes --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7648fbfa08b..c868a90d535 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,7 @@ jobs: restore-keys: ${{ runner.os }}-dreamchecker - name: Restore Yarn cache - if: ${{ contains(github.event.pull_request.labels.*.name, 'Type: TGUI Bundle') }} + if: "${{ contains(github.event.pull_request.labels.*.name, 'Type: TGUI Bundle') }}" uses: actions/cache@v3 with: path: tgui/.yarn/cache @@ -58,7 +58,7 @@ jobs: ~/dreamchecker > ${GITHUB_WORKSPACE}/output-annotations.txt 2>&1 - name: TGUI Linters - if: ${{ contains(github.event.pull_request.labels.*.name, 'Type: TGUI Bundle') }} + if: "${{ contains(github.event.pull_request.labels.*.name, 'Type: TGUI Bundle') }}" run: | cd tgui yarn install From 453c4a13aa5099d4585dbb279dc92a2d3119acca Mon Sep 17 00:00:00 2001 From: ItsSelis Date: Fri, 1 Jul 2022 23:35:23 +0200 Subject: [PATCH 04/24] Reverting to before --- .github/workflows/ci.yml | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c868a90d535..537c2217f11 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -100,25 +100,7 @@ jobs: TEST_DEFINE: "UNIT_TEST" TEST_FILE: "code/_unit_tests.dm" RUN: "1" - - map_tests: - needs: unit_tests - name: Map Tests - runs-on: ubuntu-latest - strategy: - matrix: - map: ['tether', 'stellardelight', 'groundbase'] - steps: - - uses: actions/checkout@v3 - - name: Ensure +x on CI directory - run: | - chmod -R +x ./tools/ci - - name: Setup Cache - uses: actions/cache@v3 - with: - path: $HOME/BYOND - key: ${{ runner.os }}-byond - - name: Compile POIs (${{ matrix.map }}) + - name: Compile POIs run: | tools/ci/install_byond.sh tools/ci/compile_and_run.sh @@ -126,7 +108,7 @@ jobs: TEST_DEFINE: "MAP_TEST" TEST_FILE: "code/_map_tests.dm" RUN: "0" - - name: Compile away missions (${{ matrix.map }}) + - name: Compile away missions run: | tools/ci/install_byond.sh tools/ci/compile_and_run.sh From 79ec91a174acbf14277af01846ad4b0470651e8a Mon Sep 17 00:00:00 2001 From: ItsSelis Date: Fri, 1 Jul 2022 23:41:33 +0200 Subject: [PATCH 05/24] Testing with a bundle change --- .../{NtosRevelation.js => NtosRevelation.tsx} | 14 ++++++++++---- tgui/public/tgui.bundle.js | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) rename tgui/packages/tgui/interfaces/{NtosRevelation.js => NtosRevelation.tsx} (75%) diff --git a/tgui/packages/tgui/interfaces/NtosRevelation.js b/tgui/packages/tgui/interfaces/NtosRevelation.tsx similarity index 75% rename from tgui/packages/tgui/interfaces/NtosRevelation.js rename to tgui/packages/tgui/interfaces/NtosRevelation.tsx index 381cc32835b..cdd8bc0a33f 100644 --- a/tgui/packages/tgui/interfaces/NtosRevelation.js +++ b/tgui/packages/tgui/interfaces/NtosRevelation.tsx @@ -1,9 +1,15 @@ import { Section, Button, LabeledList } from '../components'; import { useBackend } from '../backend'; import { NtosWindow } from '../layouts'; +import { BooleanLike } from 'common/react'; + +type Data = { + armed: BooleanLike; +}; export const NtosRevelation = (props, context) => { - const { act, data } = useBackend(context); + const { act, data } = useBackend(context); + const { armed } = data; return ( @@ -23,14 +29,14 @@ export const NtosRevelation = (props, context) => { label="Payload Status" buttons={