From 48d6ae50ee4591ff2e4e225554744a65a257c572 Mon Sep 17 00:00:00 2001 From: Alexander Artemenko Date: Sun, 7 Feb 2021 00:36:51 +0300 Subject: [PATCH] Removed debug code. --- .github/actions/build-docs/action.yml | 169 +------------------------- .github/workflows/docs.yml | 10 +- 2 files changed, 2 insertions(+), 177 deletions(-) diff --git a/.github/actions/build-docs/action.yml b/.github/actions/build-docs/action.yml index 792abfd..bc6abc2 100644 --- a/.github/actions/build-docs/action.yml +++ b/.github/actions/build-docs/action.yml @@ -4,25 +4,9 @@ inputs: asdf-system: description: 'ASDF system to build system for' required: true - # github-token: - # description: 'A token needed to push docs to GitHub' - # required: true qlfile-template: description: "Djula template for qlfile. All environment variables are available in it's context" required: false - # SSH_PASS: - # description: 'Password for SSH session' - # required: true - # NGROK_AUTH_TOKEN: - # description: 'Authentification token for ngrok' - # required: true - # NGROK_REGION: - # description: 'Region for ngrok session' - # required: false - # default: 'us' - # NGROK_TIMEOUT: - # description: 'Timeout in seconds for ngrok session' - # default: 21500 runs: using: composite @@ -39,163 +23,12 @@ runs: qlot exec ros install docs-builder echo ::endgroup:: - # - name: Check inputs - # run: | - # if [ -z "${{ inputs.SSH_PASS }}" ] - # then - # echo "SSH_PASS needs to be passed in the 'with' field." - # exit 1 - # fi - # if [ -z "${{ inputs.NGROK_AUTH_TOKEN }}" ] - # then - # echo "NGROK_AUTH_TOKEN needs to be passed in the 'with' field." - # exit 1 - # fi - # shell: bash - # - name: Meet OS specific prerequisites - # run: | - # if('${{ runner.os }}' -eq 'Linux') - # { - # printf "# Preparing environment..." - # echo "ngrok-stable-linux-386.zip" > ngrok_zip_name - # whoami > ssh_user - # printf " [DONE]\n\n" - - # echo "# Change the SSH user password" - # echo "${{ inputs.SSH_PASS }}`n${{ inputs.SSH_PASS }}" | sudo passwd $(cat ssh_user) - # } - # elseif('${{ runner.os }}' -eq 'macOS') - # { - # printf "# Preparing environment..." - # echo "ngrok-stable-darwin-amd64.zip" > ngrok_zip_name - # echo "root" > ssh_user - # printf " [DONE]\n\n" - - # echo "# Change the SSH user password" - # echo 'PermitRootLogin yes' | sudo tee -a /etc/ssh/sshd_config >/dev/null - # sudo launchctl unload /System/Library/LaunchDaemons/ssh.plist - # sudo launchctl load -w /System/Library/LaunchDaemons/ssh.plist - # echo "${{ inputs.SSH_PASS }}`n${{ inputs.SSH_PASS }}" | sudo passwd "root" - # } - # elseif('${{ runner.os }}' -eq 'Windows') - # { - # printf "# Preparing environment..." - # echo "ngrok-stable-windows-amd64.zip" > ngrok_zip_name - # echo $env:UserName > ssh_user - # printf " [DONE]\n\n" - - # echo "# Install SSH server" - # curl https://dl.bitvise.com/BvSshServer-Inst.exe --output BvSshServer-Inst.exe - # .\BvSshServer-Inst.exe -acceptEULA -defaultInstance - - # printf "# Setting up the SSH server to allow access..." - # $cfg = new-object -com "BssCfg815.BssCfg815" - # $cfg.settings.SetDefaults() - # $cfg.settings.access.SetDefaults() - # $cfg.settings.access.winGroups.Clear() - # $cfg.settings.access.winGroups.new.SetDefaults() - # $cfg.settings.access.winGroups.new.loginAllowed = $true - # $cfg.settings.access.winGroups.NewCommit() - # $cfg.settings.Save() - # printf " [DONE]\n\n" - - # echo "# Add Firewall rule to allow inbound TCP connection on local port 22" - # New-NetFirewallRule -Name ngrok -DisplayName 'ngrok' -Enabled True -Direction Inbound -Protocol TCP -Action Allow -LocalPort 22 - - # echo "# Start the SSH server" - # net start BvSshServer - - # echo "# Change the SSH user password" - # net user $env:UserName ${{ inputs.SSH_PASS }} - # } - # shell: pwsh - - # - name: Install and setup ngrok - # run: | - # echo "# Install ngrok" - # curl https://bin.equinox.io/c/4VmDzA7iaHb/$(cat ngrok_zip_name) --output ngrok.zip - # unzip ngrok.zip - # chmod +x ./ngrok - # echo "# Set ngrok with the given authentification token" - # ./ngrok authtoken ${{ inputs.NGROK_AUTH_TOKEN }} - # shell: bash - - # - name: Start ngrok - # run: | - # set -Eeuo pipefail - # printf "# Starting ngrok..." - # ./ngrok tcp 22 --log ".ngrok.log" --region "${{ inputs.NGROK_REGION }}" & - # printf " [DONE]\n\n" - # printf "# Waiting for '.ngrok.log' file to be properly generated..." - # while ! grep -osqE "tcp://(.+)" .ngrok.log;do - # sleep 1 - # if grep -sq "command failed" .ngrok.log - # then - # exit 1 - # fi - # done - # printf " [DONE]\n\n" - # ssh_string=$(grep -oE "tcp://(.+)" .ngrok.log | sed "s/tcp:\/\//ssh $(cat ssh_user)@/" | sed "s/:/ -p /") - # continue_path=$(eval echo ~$(cat ssh_user)/continue) - # time=${{ inputs.NGROK_TIMEOUT }} - # while [ ! -e $continue_path ] && [ $time -gt 1 ] - # do - # echo "" - # echo "#################" - # echo "# Connect to this runner using:" - # echo "#########################################" - # echo $ssh_string - # echo "#########################################" - # echo "#" - # echo "# Allow workflow to continue using:" - # echo "#########################################" - # echo "bash -c \"touch $continue_path\"" - # echo "#########################################" - # echo "#" - # echo "# SSH session time left:" - # echo "########################################" - # printf '#%-14s%dh:%02dm:%02ds%-14s#\n' '' $(($time/3600)) $(($time%3600/60)) $(($time%60)) '' - # echo "########################################" - # echo "" - - # sleep 10 - # time=$((time-10)) - # done - # echo "# SSH session terminated. Allowing workflow to continue..." - # shell: bash - - - - name: Build Docs - id: build-docs - shell: bash - run: | - echo ::group::Build Docs - echo "TRACE 1" - # OUTPUT_DIR=`build-docs ${{ inputs.asdf-system }}` - - build-docs ${{ inputs.asdf-system }} output.dir - - if [[ ! -e output.dir ]]; then - echo 'Unable to build docs' - exit 1 - fi - - OUTPUT_DIR=$(cat output.dir) - - echo "TRACE 2" - echo "::set-output name=build-dir::${OUTPUT_DIR}" - echo "TRACE 3" - echo ::endgroup:: - echo "TRACE 4" - - name: Upload Docs shell: bash run: | set -Eeuo pipefail echo ::group::Upload Docs - - ${{ github.action_path }}/upload.ros "${BUILD_DIR}" + ${{ github.action_path }}/upload.ros "$(cat output.dir)" echo ::endgroup:: env: - BUILD_DIR: ${{ steps.build-docs.outputs.build-dir }} GITHUB_TOKEN: ${{ github.token }} diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 2b03e80..e1729ee 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -28,16 +28,8 @@ jobs: asdf-system: cl-info qlfile-template: | github mgl-pax svetlyak40wt/mgl-pax :branch mgl-pax-minimal - # - name: Start SSH session - # uses: luchihoratiu/debug-via-ssh@main - # with: - # NGROK_AUTH_TOKEN: ${{ secrets.NGROK_AUTH_TOKEN }} - # NGROK_REGION: eu - # SSH_PASS: ${{ secrets.SSH_PASS }} - uses: 40ants/cl-info/.github/actions/build-docs@custom-action with: asdf-system: cl-info -# github-token: ${{ github.token }} - NGROK_AUTH_TOKEN: ${{ secrets.NGROK_AUTH_TOKEN }} - SSH_PASS: ${{ secrets.SSH_PASS }} +