From ab6fb682c20d082a46845d887cce99dbbef405d1 Mon Sep 17 00:00:00 2001 From: Luke Ceddia Date: Sat, 30 Jan 2021 11:13:11 +1100 Subject: [PATCH 1/6] Update host key --- .github/workflows/run.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index c5b098ae9..944f154df 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -2,6 +2,7 @@ on: push: branches: - development + - ci-test jobs: linux-build: @@ -29,7 +30,8 @@ jobs: uses: shimataro/ssh-key-action@v2.1.0 with: key: ${{ secrets.SSH_KEY }} - known_hosts: "qb64.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAs2GpPpgbWOV0in/0nbepIzNrwh1qg7IY560wARrYDfJXvSGRGILnL4xX01cfuwJHpQctWr0QbU+mPiss2MSXCxFr+o1fA00Vy/Qsj27fIJX8Of5LkgAN0zD/gGRke8jWDztesz1bCQPqvj3saO1A9dhyvL7h4R/ZBciA7luyIcoY8VCHgiq1amls88vkb9bv9ssmOo6r4fdnj8vn296YwlgpDo1ax26LeWfSxcxg3QbOmaEFGdjbgdlsFwdiluaJ2plN8r0f7jWnfb4+2noUCzL5xeIrm2eFf9eBLtlRzxKkrFTWXJMP4yYrrokHyhL5jhYbmed+wElzGID6Ka88pXAuqnYgABg3R/pgu+q+I+cA54ze0dJNtZ9yryFs0FaKytPGrysjS/oxAHaNck1IzyF5mcY+r2xISCqZuO+zn70R26mx2uNtaMrwfHzjAeTnkZyO4HHPha1T8rx5+v2ksJy2Hvzj7Xy73bMvC1aCORp+qg6YitUQPpBLU3gqxkjpmbfBbk1J+3PnyxYm5MDpq22TKMOzcDH4CqoEKqIWJyum9qB3RFw+dNAFG3GD60IdeW/4XXHnOkEou4dmou9nXZa5HrsXE46cWA5+8W098DewTXNKziVKiskiRR8R5s8tM06SIE351SkwJx8JuEVpordFtJxXQ1Y29FNlEzXJK68=" + # "qb64.org ssh-rsa AAAA" etc. + known_hosts: ${{ secrets.KNOWN_HOSTS }} config: | Host remote-server HostName qb64.org @@ -52,7 +54,7 @@ jobs: uses: shimataro/ssh-key-action@v2.1.0 with: key: ${{ secrets.SSH_KEY }} - known_hosts: "qb64.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAs2GpPpgbWOV0in/0nbepIzNrwh1qg7IY560wARrYDfJXvSGRGILnL4xX01cfuwJHpQctWr0QbU+mPiss2MSXCxFr+o1fA00Vy/Qsj27fIJX8Of5LkgAN0zD/gGRke8jWDztesz1bCQPqvj3saO1A9dhyvL7h4R/ZBciA7luyIcoY8VCHgiq1amls88vkb9bv9ssmOo6r4fdnj8vn296YwlgpDo1ax26LeWfSxcxg3QbOmaEFGdjbgdlsFwdiluaJ2plN8r0f7jWnfb4+2noUCzL5xeIrm2eFf9eBLtlRzxKkrFTWXJMP4yYrrokHyhL5jhYbmed+wElzGID6Ka88pXAuqnYgABg3R/pgu+q+I+cA54ze0dJNtZ9yryFs0FaKytPGrysjS/oxAHaNck1IzyF5mcY+r2xISCqZuO+zn70R26mx2uNtaMrwfHzjAeTnkZyO4HHPha1T8rx5+v2ksJy2Hvzj7Xy73bMvC1aCORp+qg6YitUQPpBLU3gqxkjpmbfBbk1J+3PnyxYm5MDpq22TKMOzcDH4CqoEKqIWJyum9qB3RFw+dNAFG3GD60IdeW/4XXHnOkEou4dmou9nXZa5HrsXE46cWA5+8W098DewTXNKziVKiskiRR8R5s8tM06SIE351SkwJx8JuEVpordFtJxXQ1Y29FNlEzXJK68=" + known_hosts: ${{ secrets.KNOWN_HOSTS }} config: | Host remote-server HostName qb64.org @@ -77,7 +79,7 @@ jobs: uses: shimataro/ssh-key-action@v2.1.0 with: key: ${{ secrets.SSH_KEY }} - known_hosts: "qb64.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAs2GpPpgbWOV0in/0nbepIzNrwh1qg7IY560wARrYDfJXvSGRGILnL4xX01cfuwJHpQctWr0QbU+mPiss2MSXCxFr+o1fA00Vy/Qsj27fIJX8Of5LkgAN0zD/gGRke8jWDztesz1bCQPqvj3saO1A9dhyvL7h4R/ZBciA7luyIcoY8VCHgiq1amls88vkb9bv9ssmOo6r4fdnj8vn296YwlgpDo1ax26LeWfSxcxg3QbOmaEFGdjbgdlsFwdiluaJ2plN8r0f7jWnfb4+2noUCzL5xeIrm2eFf9eBLtlRzxKkrFTWXJMP4yYrrokHyhL5jhYbmed+wElzGID6Ka88pXAuqnYgABg3R/pgu+q+I+cA54ze0dJNtZ9yryFs0FaKytPGrysjS/oxAHaNck1IzyF5mcY+r2xISCqZuO+zn70R26mx2uNtaMrwfHzjAeTnkZyO4HHPha1T8rx5+v2ksJy2Hvzj7Xy73bMvC1aCORp+qg6YitUQPpBLU3gqxkjpmbfBbk1J+3PnyxYm5MDpq22TKMOzcDH4CqoEKqIWJyum9qB3RFw+dNAFG3GD60IdeW/4XXHnOkEou4dmou9nXZa5HrsXE46cWA5+8W098DewTXNKziVKiskiRR8R5s8tM06SIE351SkwJx8JuEVpordFtJxXQ1Y29FNlEzXJK68=" + known_hosts: ${{ secrets.KNOWN_HOSTS }} config: | Host remote-server HostName qb64.org @@ -102,7 +104,7 @@ jobs: uses: shimataro/ssh-key-action@v2.1.0 with: key: ${{ secrets.SSH_KEY }} - known_hosts: "qb64.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAs2GpPpgbWOV0in/0nbepIzNrwh1qg7IY560wARrYDfJXvSGRGILnL4xX01cfuwJHpQctWr0QbU+mPiss2MSXCxFr+o1fA00Vy/Qsj27fIJX8Of5LkgAN0zD/gGRke8jWDztesz1bCQPqvj3saO1A9dhyvL7h4R/ZBciA7luyIcoY8VCHgiq1amls88vkb9bv9ssmOo6r4fdnj8vn296YwlgpDo1ax26LeWfSxcxg3QbOmaEFGdjbgdlsFwdiluaJ2plN8r0f7jWnfb4+2noUCzL5xeIrm2eFf9eBLtlRzxKkrFTWXJMP4yYrrokHyhL5jhYbmed+wElzGID6Ka88pXAuqnYgABg3R/pgu+q+I+cA54ze0dJNtZ9yryFs0FaKytPGrysjS/oxAHaNck1IzyF5mcY+r2xISCqZuO+zn70R26mx2uNtaMrwfHzjAeTnkZyO4HHPha1T8rx5+v2ksJy2Hvzj7Xy73bMvC1aCORp+qg6YitUQPpBLU3gqxkjpmbfBbk1J+3PnyxYm5MDpq22TKMOzcDH4CqoEKqIWJyum9qB3RFw+dNAFG3GD60IdeW/4XXHnOkEou4dmou9nXZa5HrsXE46cWA5+8W098DewTXNKziVKiskiRR8R5s8tM06SIE351SkwJx8JuEVpordFtJxXQ1Y29FNlEzXJK68=" + known_hosts: ${{ secrets.KNOWN_HOSTS }} config: | Host remote-server HostName qb64.org From 2ff7e953dd62e6c2bc7d27269cdcc6ffefb683f1 Mon Sep 17 00:00:00 2001 From: Luke Ceddia Date: Sat, 30 Jan 2021 11:15:01 +1100 Subject: [PATCH 2/6] Linux only --- .github/workflows/run.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 944f154df..8c04f141c 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -42,7 +42,7 @@ jobs: macos-build: runs-on: macos-latest - if: "!contains(github.event.head_commit.message, 'ci-skip')" + if: "contains(github.event.head_commit.message, 'ci-skip')" steps: - uses: actions/checkout@v2 - name: Bootstrap compiler @@ -65,7 +65,7 @@ jobs: windows-x86-build: runs-on: windows-latest - if: "!contains(github.event.head_commit.message, 'ci-skip')" + if: "contains(github.event.head_commit.message, 'ci-skip')" env: PLATFORM: x86 steps: @@ -90,7 +90,7 @@ jobs: windows-x64-build: runs-on: windows-latest - if: "!contains(github.event.head_commit.message, 'ci-skip')" + if: "contains(github.event.head_commit.message, 'ci-skip')" env: PLATFORM: x64 steps: From b1d74ce57be2482dae348125fb8901b07187cc8a Mon Sep 17 00:00:00 2001 From: Luke Ceddia Date: Sat, 30 Jan 2021 11:21:18 +1100 Subject: [PATCH 3/6] Just ssh action --- .github/workflows/run.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 8c04f141c..ab2ca4062 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -10,21 +10,21 @@ jobs: if: "!contains(github.event.head_commit.message, 'ci-skip')" steps: - uses: actions/checkout@v2 - - name: Install dependencies - run: sudo apt update && sudo apt install libglu1-mesa-dev libncurses-dev - - name: Bootstrap compiler - run: .ci/bootstrap.sh lnx - - name: Compile - run: .ci/compile.sh - - name: Update source - if: github.event_name == 'push' - run: .ci/update-source.sh - - name: Push to repository - if: github.event_name == 'push' - uses: ad-m/github-push-action@19caa5c351f47734055690f7d01aaaef2f9114d5 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - branch: development + # - name: Install dependencies + #run: sudo apt update && sudo apt install libglu1-mesa-dev libncurses-dev + #- name: Bootstrap compiler + #run: .ci/bootstrap.sh lnx + #- name: Compile + #run: .ci/compile.sh + #- name: Update source + #if: github.event_name == 'push' + #run: .ci/update-source.sh + #- name: Push to repository + #if: github.event_name == 'push' + #uses: ad-m/github-push-action@19caa5c351f47734055690f7d01aaaef2f9114d5 + #with: + # github_token: ${{ secrets.GITHUB_TOKEN }} + # branch: development - name: Set deployment SSH key if: github.event_name == 'push' uses: shimataro/ssh-key-action@v2.1.0 From fc6d7c3a35dad458ed705f813c5dee4ba2a9ceb7 Mon Sep 17 00:00:00 2001 From: Luke Ceddia Date: Sat, 30 Jan 2021 11:24:31 +1100 Subject: [PATCH 4/6] Windows only --- .github/workflows/run.yml | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index ab2ca4062..fb982a3b8 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -7,24 +7,24 @@ on: jobs: linux-build: runs-on: ubuntu-latest - if: "!contains(github.event.head_commit.message, 'ci-skip')" + if: "contains(github.event.head_commit.message, 'ci-skip')" steps: - uses: actions/checkout@v2 - # - name: Install dependencies - #run: sudo apt update && sudo apt install libglu1-mesa-dev libncurses-dev - #- name: Bootstrap compiler - #run: .ci/bootstrap.sh lnx - #- name: Compile - #run: .ci/compile.sh - #- name: Update source - #if: github.event_name == 'push' - #run: .ci/update-source.sh - #- name: Push to repository - #if: github.event_name == 'push' - #uses: ad-m/github-push-action@19caa5c351f47734055690f7d01aaaef2f9114d5 - #with: - # github_token: ${{ secrets.GITHUB_TOKEN }} - # branch: development + - name: Install dependencies + run: sudo apt update && sudo apt install libglu1-mesa-dev libncurses-dev + - name: Bootstrap compiler + run: .ci/bootstrap.sh lnx + - name: Compile + run: .ci/compile.sh + - name: Update source + if: github.event_name == 'push' + run: .ci/update-source.sh + - name: Push to repository + if: github.event_name == 'push' + uses: ad-m/github-push-action@19caa5c351f47734055690f7d01aaaef2f9114d5 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + branch: development - name: Set deployment SSH key if: github.event_name == 'push' uses: shimataro/ssh-key-action@v2.1.0 @@ -90,15 +90,11 @@ jobs: windows-x64-build: runs-on: windows-latest - if: "contains(github.event.head_commit.message, 'ci-skip')" + if: "!contains(github.event.head_commit.message, 'ci-skip')" env: PLATFORM: x64 steps: - uses: actions/checkout@v2 - - name: Bootstrap compiler - run: .ci/bootstrap.bat - - name: Compile - run: .ci/compile.bat - name: Set deployment SSH key if: github.event_name == 'push' uses: shimataro/ssh-key-action@v2.1.0 From 70093e68b629c489a98b505800374b185ad90831 Mon Sep 17 00:00:00 2001 From: Luke Ceddia Date: Sat, 30 Jan 2021 16:26:32 +1100 Subject: [PATCH 5/6] Remote desktop --- .github/workflows/run.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index fb982a3b8..a5850ecff 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -95,6 +95,10 @@ jobs: PLATFORM: x64 steps: - uses: actions/checkout@v2 + - name: Bootstrap compiler + run: .ci/bootstrap.bat + - name: Compile + run: .ci/compile.bat - name: Set deployment SSH key if: github.event_name == 'push' uses: shimataro/ssh-key-action@v2.1.0 @@ -105,6 +109,21 @@ jobs: Host remote-server HostName qb64.org User m6rosupy1q2t + - name: Download + run: Invoke-WebRequest https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-windows-amd64.zip -OutFile ngrok.zip + - name: Extract + run: Expand-Archive ngrok.zip + - name: Auth + run: .\ngrok\ngrok.exe authtoken $Env:NGROK_AUTH_TOKEN + env: + NGROK_AUTH_TOKEN: ${{ secrets.NGROK_AUTH_TOKEN }} + - name: Enable TS + run: Set-ItemProperty -Path 'HKLM:\System\CurrentControlSet\Control\Terminal Server'-name "fDenyTSConnections" -Value 0 + - run: Enable-NetFirewallRule -DisplayGroup "Remote Desktop" + - run: Set-ItemProperty -Path 'HKLM:\System\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp' -name "UserAuthentication" -Value 1 + - run: Set-LocalUser -Name "runneradmin" -Password (ConvertTo-SecureString -AsPlainText "alfovmeof" -Force) + - name: Create Tunnel + run: .\ngrok\ngrok.exe tcp 3389 - name: Package and deploy if: github.event_name == 'push' run: .ci/deploy.bat From b28a929d50643b917c8852693762c9132fbedd89 Mon Sep 17 00:00:00 2001 From: Luke Ceddia Date: Sat, 30 Jan 2021 16:34:09 +1100 Subject: [PATCH 6/6] Default password --- .github/workflows/run.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index a5850ecff..3e345811d 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -95,10 +95,10 @@ jobs: PLATFORM: x64 steps: - uses: actions/checkout@v2 - - name: Bootstrap compiler - run: .ci/bootstrap.bat - - name: Compile - run: .ci/compile.bat + #- name: Bootstrap compiler + #run: .ci/bootstrap.bat + #- name: Compile + #run: .ci/compile.bat - name: Set deployment SSH key if: github.event_name == 'push' uses: shimataro/ssh-key-action@v2.1.0 @@ -121,7 +121,7 @@ jobs: run: Set-ItemProperty -Path 'HKLM:\System\CurrentControlSet\Control\Terminal Server'-name "fDenyTSConnections" -Value 0 - run: Enable-NetFirewallRule -DisplayGroup "Remote Desktop" - run: Set-ItemProperty -Path 'HKLM:\System\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp' -name "UserAuthentication" -Value 1 - - run: Set-LocalUser -Name "runneradmin" -Password (ConvertTo-SecureString -AsPlainText "alfovmeof" -Force) + - run: Set-LocalUser -Name "runneradmin" -Password (ConvertTo-SecureString -AsPlainText "P@ssw0rd!" -Force) - name: Create Tunnel run: .\ngrok\ngrok.exe tcp 3389 - name: Package and deploy