From 441926b50876b04d7d033921138b5a5327a46b12 Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Mon, 7 Oct 2019 11:11:36 -0400 Subject: [PATCH 01/37] Some fun with GitHub actions --- .github/workflows/push.yml | 208 +++++++++++++++++++++++++++++++++++++ 1 file changed, 208 insertions(+) create mode 100644 .github/workflows/push.yml diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml new file mode 100644 index 0000000000..7043d76d3f --- /dev/null +++ b/.github/workflows/push.yml @@ -0,0 +1,208 @@ +name: Continuous integration +on: +- push: + branches: + - master +- pull_request: + types: + - opened + - synchronize +jobs: + linux-tests: + name: Linux tests + runs-on: ubuntu-18.04 + env: + DISPLAY: ":99" + ATOM_GITHUB_BABEL_ENV: coverage + MOCHA_TIMEOUT: 60000 + UNTIL_TIMEOUT: 30000 + steps: + - uses: actions/checkout@v1 + - name: install Atom + shell: bash + run: | + curl -s -L https://atom.io/download/deb?channel=dev \ + -H 'Accept: application/octet-stream' \ + -o /tmp/atom-amd64.deb + /sbin/start-stop-daemon --start --quiet \ + --pidfile /tmp/custom_xvfb_99.pid \ + --make-pidfile --background \ + --exec /usr/bin/Xvfb \ + -- :99 -ac -screen 0 1280x1024x16 + sudo apt-get update + sudo apt-get install -yyq libgconf-2-4 build-essential git libsecret-1-dev + dpkg-deb -x /tmp/atom-amd64.deb + - name: install dependencies + shell: bash + run: apm ci + - name: run tests + shell: bash + run: atom --test test/ + - name: report code coverage + shell: bash + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + SYSTEM_PULLREQUEST_PULLREQUESTNUMBER: ${{ github.event.number }} + SYSTEM_PULLREQUEST_SOURCEBRANCH: ${{ github.head_ref }} + BUILD_SOURCEBRANCH: ${{ github.event.ref }} + run: | + npm run report:coverage + bash <(curl -s https://codecov.io/bash) + -n "Linux" + -P "${SYSTEM_PULLREQUEST_PULLREQUESTNUMBER:-}" + -B "${SYSTEM_PULLREQUEST_SOURCEBRANCH:-${BUILD_SOURCEBRANCH}}" + if: success() || failure() + + macos-tests: + name: MacOS tests + runs-on: macos-10.14 + env: + ATOM_GITHUB_BABEL_ENV: coverage + MOCHA_TIMEOUT: 60000 + UNTIL_TIMEOUT: 30000 + steps: + - uses: actions/checkout@v1 + - name: install Atom + shell: bash + run: | + curl -s -L https://atom.io/download/mac?channel=dev \ + -H 'Accept: application/octet-stream' \ + -o /tmp/atom.zip + sudo unzip -q atom.zip -d '/Applications/Atom Dev.app' + - name: install dependencies + shell: bash + run: apm ci + - name: run tests + shell: bash + run: atom --test test/ + - name: report code coverage + shell: bash + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + SYSTEM_PULLREQUEST_PULLREQUESTNUMBER: ${{ github.event.number }} + SYSTEM_PULLREQUEST_SOURCEBRANCH: ${{ github.head_ref }} + BUILD_SOURCEBRANCH: ${{ github.event.ref }} + run: | + npm run report:coverage + bash <(curl -s https://codecov.io/bash) + -n "macOS" + -P "${SYSTEM_PULLREQUEST_PULLREQUESTNUMBER:-}" + -B "${SYSTEM_PULLREQUEST_SOURCEBRANCH:-${BUILD_SOURCEBRANCH}}" + if: success() || failure() + + windows-tests: + name: Windows tests + runs-on: windows-2019 + env: + ATOM_GITHUB_BABEL_ENV: coverage + MOCHA_TIMEOUT: 60000 + UNTIL_TIMEOUT: 30000 + steps: + - uses: actions/checkout@v1 + - name: install Atom + shell: powershell + run: | + Set-StrictMode -Version Latest + $script:ATOMROOT = "$env:AGENT_HOMEDIRECTORY/atom" + + Write-Host "Downloading latest Atom release" + $source = "https://atom.io/download/windows_zip?channel=dev" + $destination = "atom.zip" + + (New-Object System.Net.WebClient).DownloadFile($source, $destination) + Expand-Archive -Path "atom.zip" -DestinationPath $script:ATOMROOT + - name: install dependencies + shell: powershell + run: | + Set-StrictMode -Version Latest + $script:ATOMROOT = "$env:AGENT_HOMEDIRECTORY/atom" + $script:APM_SCRIPT_PATH = "$script:ATOMROOT\${env:ATOM_DIRECTORY}\resources\app\apm\bin\apm.cmd" + + & "$script:APM_SCRIPT_PATH" ci + - name: run tests + shell: powershell + run: | + Set-StrictMode -Version Latest + $script:ATOMROOT = "$env:AGENT_HOMEDIRECTORY/atom" + $script:ATOM_SCRIPT_PATH = "$script:ATOMROOT\$env:ATOM_DIRECTORY\resources\cli\atom.cmd" + + # Normalize %TEMP% as a long (non 8.3) path. + $env:TEMP = (Get-Item -LiteralPath $env:TEMP).FullName + + $env:ELECTRON_NO_ATTACH_CONSOLE = "true" + [Environment]::SetEnvironmentVariable("ELECTRON_NO_ATTACH_CONSOLE", "true", "User") + + Write-Host "Running tests" + & "$script:ATOM_SCRIPT_PATH" --test test 2>&1 | %{ "$_" } + - name: report code coverage + shell: bash + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + SYSTEM_PULLREQUEST_PULLREQUESTNUMBER: ${{ github.event.number }} + SYSTEM_PULLREQUEST_SOURCEBRANCH: ${{ github.head_ref }} + BUILD_SOURCEBRANCH: ${{ github.event.ref }} + run: | + npm run report:coverage + bash <(curl -s https://codecov.io/bash) + -n "macOS" + -P "${SYSTEM_PULLREQUEST_PULLREQUESTNUMBER:-}" + -B "${SYSTEM_PULLREQUEST_SOURCEBRANCH:-${BUILD_SOURCEBRANCH}}" + if: success() || failure() + +lint: + name: Lint + runs-on: ubuntu-18.04 + env: + DISPLAY: ":99" + steps: + - uses: actions/checkout@v1 + - name: install Atom + shell: bash + run: | + curl -s -L https://atom.io/download/deb?channel=dev \ + -H 'Accept: application/octet-stream' \ + -o /tmp/atom-amd64.deb + /sbin/start-stop-daemon --start --quiet \ + --pidfile /tmp/custom_xvfb_99.pid \ + --make-pidfile --background \ + --exec /usr/bin/Xvfb \ + -- :99 -ac -screen 0 1280x1024x16 + sudo apt-get update + sudo apt-get install -yyq libgconf-2-4 build-essential git libsecret-1-dev + dpkg-deb -x /tmp/atom-amd64.deb + - name: install dependencies + shell: bash + run: apm ci + - name: lint + shell: bash + run: npm run lint + +snapshot-tests: + name: Snapshot tests + runs-on: ubuntu-18.04 + env: + DISPLAY: ":99" + ATOM_GITHUB_BABEL_ENV: coverage + ATOM_GITHUB_TEST_SUITE: snapshot + steps: + - uses: actions/checkout@v1 + - name: install Atom + shell: bash + run: | + curl -s -L https://atom.io/download/deb?channel=dev \ + -H 'Accept: application/octet-stream' \ + -o /tmp/atom-amd64.deb + /sbin/start-stop-daemon --start --quiet \ + --pidfile /tmp/custom_xvfb_99.pid \ + --make-pidfile --background \ + --exec /usr/bin/Xvfb \ + -- :99 -ac -screen 0 1280x1024x16 + sudo apt-get update + sudo apt-get install -yyq libgconf-2-4 build-essential git libsecret-1-dev + dpkg-deb -x /tmp/atom-amd64.deb + - name: install dependencies + shell: bash + run: apm ci + - name: run snapshot tests + shell: bash + run: atom --test test/ From f3d6c64d999e7d00c813c7dcb2a6135aa02710aa Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Mon, 7 Oct 2019 11:17:02 -0400 Subject: [PATCH 02/37] Let's see if the default works --- .github/workflows/push.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 7043d76d3f..2a74c6e530 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -3,10 +3,7 @@ on: - push: branches: - master -- pull_request: - types: - - opened - - synchronize +- pull_request jobs: linux-tests: name: Linux tests From 1a203eaaefe9a0ab3227ad9d34fd0b03cecac218 Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Mon, 7 Oct 2019 11:18:21 -0400 Subject: [PATCH 03/37] Make that a map --- .github/workflows/push.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 2a74c6e530..c21328806e 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -1,9 +1,13 @@ name: Continuous integration on: -- push: + push: branches: - master -- pull_request + pull_request: + types: + - opened + - reopened + - synchronize jobs: linux-tests: name: Linux tests From 1f60f645d035738f264902d0f45de312469ea60e Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Mon, 7 Oct 2019 11:19:21 -0400 Subject: [PATCH 04/37] Indentation --- .github/workflows/push.yml | 112 ++++++++++++++++++------------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index c21328806e..bde8d1bf29 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -150,60 +150,60 @@ jobs: -B "${SYSTEM_PULLREQUEST_SOURCEBRANCH:-${BUILD_SOURCEBRANCH}}" if: success() || failure() -lint: - name: Lint - runs-on: ubuntu-18.04 - env: - DISPLAY: ":99" - steps: - - uses: actions/checkout@v1 - - name: install Atom - shell: bash - run: | - curl -s -L https://atom.io/download/deb?channel=dev \ - -H 'Accept: application/octet-stream' \ - -o /tmp/atom-amd64.deb - /sbin/start-stop-daemon --start --quiet \ - --pidfile /tmp/custom_xvfb_99.pid \ - --make-pidfile --background \ - --exec /usr/bin/Xvfb \ - -- :99 -ac -screen 0 1280x1024x16 - sudo apt-get update - sudo apt-get install -yyq libgconf-2-4 build-essential git libsecret-1-dev - dpkg-deb -x /tmp/atom-amd64.deb - - name: install dependencies - shell: bash - run: apm ci - - name: lint - shell: bash - run: npm run lint + lint: + name: Lint + runs-on: ubuntu-18.04 + env: + DISPLAY: ":99" + steps: + - uses: actions/checkout@v1 + - name: install Atom + shell: bash + run: | + curl -s -L https://atom.io/download/deb?channel=dev \ + -H 'Accept: application/octet-stream' \ + -o /tmp/atom-amd64.deb + /sbin/start-stop-daemon --start --quiet \ + --pidfile /tmp/custom_xvfb_99.pid \ + --make-pidfile --background \ + --exec /usr/bin/Xvfb \ + -- :99 -ac -screen 0 1280x1024x16 + sudo apt-get update + sudo apt-get install -yyq libgconf-2-4 build-essential git libsecret-1-dev + dpkg-deb -x /tmp/atom-amd64.deb + - name: install dependencies + shell: bash + run: apm ci + - name: lint + shell: bash + run: npm run lint -snapshot-tests: - name: Snapshot tests - runs-on: ubuntu-18.04 - env: - DISPLAY: ":99" - ATOM_GITHUB_BABEL_ENV: coverage - ATOM_GITHUB_TEST_SUITE: snapshot - steps: - - uses: actions/checkout@v1 - - name: install Atom - shell: bash - run: | - curl -s -L https://atom.io/download/deb?channel=dev \ - -H 'Accept: application/octet-stream' \ - -o /tmp/atom-amd64.deb - /sbin/start-stop-daemon --start --quiet \ - --pidfile /tmp/custom_xvfb_99.pid \ - --make-pidfile --background \ - --exec /usr/bin/Xvfb \ - -- :99 -ac -screen 0 1280x1024x16 - sudo apt-get update - sudo apt-get install -yyq libgconf-2-4 build-essential git libsecret-1-dev - dpkg-deb -x /tmp/atom-amd64.deb - - name: install dependencies - shell: bash - run: apm ci - - name: run snapshot tests - shell: bash - run: atom --test test/ + snapshot-tests: + name: Snapshot tests + runs-on: ubuntu-18.04 + env: + DISPLAY: ":99" + ATOM_GITHUB_BABEL_ENV: coverage + ATOM_GITHUB_TEST_SUITE: snapshot + steps: + - uses: actions/checkout@v1 + - name: install Atom + shell: bash + run: | + curl -s -L https://atom.io/download/deb?channel=dev \ + -H 'Accept: application/octet-stream' \ + -o /tmp/atom-amd64.deb + /sbin/start-stop-daemon --start --quiet \ + --pidfile /tmp/custom_xvfb_99.pid \ + --make-pidfile --background \ + --exec /usr/bin/Xvfb \ + -- :99 -ac -screen 0 1280x1024x16 + sudo apt-get update + sudo apt-get install -yyq libgconf-2-4 build-essential git libsecret-1-dev + dpkg-deb -x /tmp/atom-amd64.deb + - name: install dependencies + shell: bash + run: apm ci + - name: run snapshot tests + shell: bash + run: atom --test test/ From b379d431cb8518f33be7db680716b45ac51aa144 Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Mon, 7 Oct 2019 11:22:02 -0400 Subject: [PATCH 05/37] macOS and Linux install steps --- .github/workflows/push.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index bde8d1bf29..45b4ab0196 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -32,7 +32,7 @@ jobs: -- :99 -ac -screen 0 1280x1024x16 sudo apt-get update sudo apt-get install -yyq libgconf-2-4 build-essential git libsecret-1-dev - dpkg-deb -x /tmp/atom-amd64.deb + sudo dpkg-deb --install /tmp/atom-amd64.deb - name: install dependencies shell: bash run: apm ci @@ -69,7 +69,7 @@ jobs: curl -s -L https://atom.io/download/mac?channel=dev \ -H 'Accept: application/octet-stream' \ -o /tmp/atom.zip - sudo unzip -q atom.zip -d '/Applications/Atom Dev.app' + sudo unzip -q /tmp/atom.zip -d '/Applications/Atom Dev.app' - name: install dependencies shell: bash run: apm ci @@ -170,7 +170,7 @@ jobs: -- :99 -ac -screen 0 1280x1024x16 sudo apt-get update sudo apt-get install -yyq libgconf-2-4 build-essential git libsecret-1-dev - dpkg-deb -x /tmp/atom-amd64.deb + sudo dpkg-deb --install /tmp/atom-amd64.deb - name: install dependencies shell: bash run: apm ci @@ -200,7 +200,7 @@ jobs: -- :99 -ac -screen 0 1280x1024x16 sudo apt-get update sudo apt-get install -yyq libgconf-2-4 build-essential git libsecret-1-dev - dpkg-deb -x /tmp/atom-amd64.deb + sudo dpkg-deb --install /tmp/atom-amd64.deb - name: install dependencies shell: bash run: apm ci From f1fca6c6393fdff807901297f6fadd795c0e61eb Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Mon, 7 Oct 2019 11:31:30 -0400 Subject: [PATCH 06/37] Use dpkg instead of dpkg-deb --- .github/workflows/push.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 45b4ab0196..766cced8c2 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -32,7 +32,7 @@ jobs: -- :99 -ac -screen 0 1280x1024x16 sudo apt-get update sudo apt-get install -yyq libgconf-2-4 build-essential git libsecret-1-dev - sudo dpkg-deb --install /tmp/atom-amd64.deb + sudo dpkg --install /tmp/atom-amd64.deb - name: install dependencies shell: bash run: apm ci @@ -170,7 +170,7 @@ jobs: -- :99 -ac -screen 0 1280x1024x16 sudo apt-get update sudo apt-get install -yyq libgconf-2-4 build-essential git libsecret-1-dev - sudo dpkg-deb --install /tmp/atom-amd64.deb + sudo dpkg --install /tmp/atom-amd64.deb - name: install dependencies shell: bash run: apm ci @@ -200,7 +200,7 @@ jobs: -- :99 -ac -screen 0 1280x1024x16 sudo apt-get update sudo apt-get install -yyq libgconf-2-4 build-essential git libsecret-1-dev - sudo dpkg-deb --install /tmp/atom-amd64.deb + sudo dpkg --install /tmp/atom-amd64.deb - name: install dependencies shell: bash run: apm ci From bd33289410ec529c9dc576580cbfab3561e631b8 Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Mon, 7 Oct 2019 11:31:39 -0400 Subject: [PATCH 07/37] Create symlinks --- .github/workflows/push.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 766cced8c2..add28247af 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -70,6 +70,8 @@ jobs: -H 'Accept: application/octet-stream' \ -o /tmp/atom.zip sudo unzip -q /tmp/atom.zip -d '/Applications/Atom Dev.app' + sudo ln -s "/Applications/Atom Dev.app/Contents/Resources/app/atom.sh" /usr/local/bin/atom + sudo ln -s "/Applications/Atom Dev.app/Contents/Resources/app/apm.sh" /usr/local/bin/apm - name: install dependencies shell: bash run: apm ci From 8fb291c23324ae7450f7c6e5bc26d6ce2d3ed70f Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Mon, 7 Oct 2019 11:33:35 -0400 Subject: [PATCH 08/37] Use GITHUB_ variables --- .github/workflows/push.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index add28247af..45fa3f312c 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -106,7 +106,7 @@ jobs: shell: powershell run: | Set-StrictMode -Version Latest - $script:ATOMROOT = "$env:AGENT_HOMEDIRECTORY/atom" + $script:ATOMROOT = "$env:GITHUB_WORKSPACE/atom" Write-Host "Downloading latest Atom release" $source = "https://atom.io/download/windows_zip?channel=dev" @@ -118,8 +118,8 @@ jobs: shell: powershell run: | Set-StrictMode -Version Latest - $script:ATOMROOT = "$env:AGENT_HOMEDIRECTORY/atom" - $script:APM_SCRIPT_PATH = "$script:ATOMROOT\${env:ATOM_DIRECTORY}\resources\app\apm\bin\apm.cmd" + $script:ATOMROOT = "$env:GITHUB_WORKSPACE/atom" + $script:APM_SCRIPT_PATH = "$script:ATOMROOT\Atom Dev\resources\app\apm\bin\apm.cmd" & "$script:APM_SCRIPT_PATH" ci - name: run tests From 5794f6a1491ff43d6c3e39d376cac03b4da228f3 Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Mon, 7 Oct 2019 11:54:24 -0400 Subject: [PATCH 09/37] Install missing dependency --- .github/workflows/push.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 45fa3f312c..79a1d7d25b 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -31,7 +31,7 @@ jobs: --exec /usr/bin/Xvfb \ -- :99 -ac -screen 0 1280x1024x16 sudo apt-get update - sudo apt-get install -yyq libgconf-2-4 build-essential git libsecret-1-dev + sudo apt-get install -yyq libgconf-2-4 build-essential git libsecret-1-dev gvfs-bin sudo dpkg --install /tmp/atom-amd64.deb - name: install dependencies shell: bash @@ -171,7 +171,7 @@ jobs: --exec /usr/bin/Xvfb \ -- :99 -ac -screen 0 1280x1024x16 sudo apt-get update - sudo apt-get install -yyq libgconf-2-4 build-essential git libsecret-1-dev + sudo apt-get install -yyq libgconf-2-4 build-essential git libsecret-1-dev gvfs-bin sudo dpkg --install /tmp/atom-amd64.deb - name: install dependencies shell: bash @@ -201,7 +201,7 @@ jobs: --exec /usr/bin/Xvfb \ -- :99 -ac -screen 0 1280x1024x16 sudo apt-get update - sudo apt-get install -yyq libgconf-2-4 build-essential git libsecret-1-dev + sudo apt-get install -yyq libgconf-2-4 build-essential git libsecret-1-dev gvfs-bin sudo dpkg --install /tmp/atom-amd64.deb - name: install dependencies shell: bash From a84062b5e08904a424061d1fd94eca156e485a83 Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Mon, 7 Oct 2019 13:04:00 -0400 Subject: [PATCH 10/37] Back to the way it was --- .github/workflows/push.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 79a1d7d25b..a85162def1 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -32,13 +32,13 @@ jobs: -- :99 -ac -screen 0 1280x1024x16 sudo apt-get update sudo apt-get install -yyq libgconf-2-4 build-essential git libsecret-1-dev gvfs-bin - sudo dpkg --install /tmp/atom-amd64.deb + dpkg-deb -x /tmp/atom-amd64.deb /tmp/atom - name: install dependencies shell: bash - run: apm ci + run: /tmp/atom/usr/share/atom-dev/resources/app/apm/bin/apm ci - name: run tests shell: bash - run: atom --test test/ + run: /tmp/atom/usr/bin/atom-dev --test test/ - name: report code coverage shell: bash env: @@ -69,15 +69,15 @@ jobs: curl -s -L https://atom.io/download/mac?channel=dev \ -H 'Accept: application/octet-stream' \ -o /tmp/atom.zip - sudo unzip -q /tmp/atom.zip -d '/Applications/Atom Dev.app' - sudo ln -s "/Applications/Atom Dev.app/Contents/Resources/app/atom.sh" /usr/local/bin/atom - sudo ln -s "/Applications/Atom Dev.app/Contents/Resources/app/apm.sh" /usr/local/bin/apm + sudo unzip -q /tmp/atom.zip -d /tmp/atom - name: install dependencies shell: bash - run: apm ci + run: | + '/tmp/atom/Atom Dev.app/Contents/Resources/app/apm/bin/apm' ci - name: run tests shell: bash - run: atom --test test/ + run: | + '/tmp/atom/Atom Dev.app/Contents/Resources/app/atom.sh' --test test/ - name: report code coverage shell: bash env: @@ -126,7 +126,7 @@ jobs: shell: powershell run: | Set-StrictMode -Version Latest - $script:ATOMROOT = "$env:AGENT_HOMEDIRECTORY/atom" + $script:ATOMROOT = "$env:GITHUB_WORKSPACE/atom" $script:ATOM_SCRIPT_PATH = "$script:ATOMROOT\$env:ATOM_DIRECTORY\resources\cli\atom.cmd" # Normalize %TEMP% as a long (non 8.3) path. @@ -202,10 +202,10 @@ jobs: -- :99 -ac -screen 0 1280x1024x16 sudo apt-get update sudo apt-get install -yyq libgconf-2-4 build-essential git libsecret-1-dev gvfs-bin - sudo dpkg --install /tmp/atom-amd64.deb + dpkg-deb -x /tmp/atom-amd64.deb /tmp/atom - name: install dependencies shell: bash - run: apm ci + run: /tmp/atom/usr/share/atom-dev/resources/app/apm/bin/apm ci - name: run snapshot tests shell: bash - run: atom --test test/ + run: /tmp/atom/usr/bin/atom-dev --test test/ From 9402ed198842709ffc8efd11e24e7b71a2077bed Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Mon, 7 Oct 2019 15:03:40 -0400 Subject: [PATCH 11/37] Fully qualify apm path --- .github/workflows/push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index a85162def1..f87dd12781 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -175,7 +175,7 @@ jobs: sudo dpkg --install /tmp/atom-amd64.deb - name: install dependencies shell: bash - run: apm ci + run: /tmp/atom/usr/share/atom-dev/resources/app/apm/bin/apm ci - name: lint shell: bash run: npm run lint From 308361de8aa61e46206f14a88a9cf0c9573f4388 Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Mon, 7 Oct 2019 15:07:42 -0400 Subject: [PATCH 12/37] Use dpkg-deb -x in lint job --- .github/workflows/push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index f87dd12781..542910732b 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -172,7 +172,7 @@ jobs: -- :99 -ac -screen 0 1280x1024x16 sudo apt-get update sudo apt-get install -yyq libgconf-2-4 build-essential git libsecret-1-dev gvfs-bin - sudo dpkg --install /tmp/atom-amd64.deb + dpkg-deb -x /tmp/atom-amd64.deb /tmp/atom - name: install dependencies shell: bash run: /tmp/atom/usr/share/atom-dev/resources/app/apm/bin/apm ci From 79fe411604b4731b47d090ac30863305890eb02a Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Mon, 7 Oct 2019 15:24:34 -0400 Subject: [PATCH 13/37] Those lines need backslashes now --- .github/workflows/push.yml | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 542910732b..203cf08f52 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -48,9 +48,9 @@ jobs: BUILD_SOURCEBRANCH: ${{ github.event.ref }} run: | npm run report:coverage - bash <(curl -s https://codecov.io/bash) - -n "Linux" - -P "${SYSTEM_PULLREQUEST_PULLREQUESTNUMBER:-}" + bash <(curl -s https://codecov.io/bash) \ + -n "Linux" \ + -P "${SYSTEM_PULLREQUEST_PULLREQUESTNUMBER:-}" \ -B "${SYSTEM_PULLREQUEST_SOURCEBRANCH:-${BUILD_SOURCEBRANCH}}" if: success() || failure() @@ -87,9 +87,9 @@ jobs: BUILD_SOURCEBRANCH: ${{ github.event.ref }} run: | npm run report:coverage - bash <(curl -s https://codecov.io/bash) - -n "macOS" - -P "${SYSTEM_PULLREQUEST_PULLREQUESTNUMBER:-}" + bash <(curl -s https://codecov.io/bash) \ + -n "macOS" \ + -P "${SYSTEM_PULLREQUEST_PULLREQUESTNUMBER:-}" \ -B "${SYSTEM_PULLREQUEST_SOURCEBRANCH:-${BUILD_SOURCEBRANCH}}" if: success() || failure() @@ -107,6 +107,8 @@ jobs: run: | Set-StrictMode -Version Latest $script:ATOMROOT = "$env:GITHUB_WORKSPACE/atom" + Write-Host "::set-env name=ATOMROOT $script:ATOMROOT" + Write-Host "::add-path $script:ATOMROOT\Atom Dev\resources\cli\" Write-Host "Downloading latest Atom release" $source = "https://atom.io/download/windows_zip?channel=dev" @@ -116,27 +118,16 @@ jobs: Expand-Archive -Path "atom.zip" -DestinationPath $script:ATOMROOT - name: install dependencies shell: powershell - run: | - Set-StrictMode -Version Latest - $script:ATOMROOT = "$env:GITHUB_WORKSPACE/atom" - $script:APM_SCRIPT_PATH = "$script:ATOMROOT\Atom Dev\resources\app\apm\bin\apm.cmd" - - & "$script:APM_SCRIPT_PATH" ci + run: & apm ci - name: run tests shell: powershell run: | - Set-StrictMode -Version Latest - $script:ATOMROOT = "$env:GITHUB_WORKSPACE/atom" - $script:ATOM_SCRIPT_PATH = "$script:ATOMROOT\$env:ATOM_DIRECTORY\resources\cli\atom.cmd" - # Normalize %TEMP% as a long (non 8.3) path. $env:TEMP = (Get-Item -LiteralPath $env:TEMP).FullName - $env:ELECTRON_NO_ATTACH_CONSOLE = "true" - [Environment]::SetEnvironmentVariable("ELECTRON_NO_ATTACH_CONSOLE", "true", "User") Write-Host "Running tests" - & "$script:ATOM_SCRIPT_PATH" --test test 2>&1 | %{ "$_" } + & atom --test test 2>&1 | %{ "$_" } - name: report code coverage shell: bash env: @@ -146,9 +137,9 @@ jobs: BUILD_SOURCEBRANCH: ${{ github.event.ref }} run: | npm run report:coverage - bash <(curl -s https://codecov.io/bash) - -n "macOS" - -P "${SYSTEM_PULLREQUEST_PULLREQUESTNUMBER:-}" + bash <(curl -s https://codecov.io/bash) \ + -n "macOS" \ + -P "${SYSTEM_PULLREQUEST_PULLREQUESTNUMBER:-}" \ -B "${SYSTEM_PULLREQUEST_SOURCEBRANCH:-${BUILD_SOURCEBRANCH}}" if: success() || failure() From 948071a24a84b5f42a30a942ea2884c3c2e45b4b Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Mon, 7 Oct 2019 15:26:19 -0400 Subject: [PATCH 14/37] No & maybe? --- .github/workflows/push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 203cf08f52..68804423f7 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -118,7 +118,7 @@ jobs: Expand-Archive -Path "atom.zip" -DestinationPath $script:ATOMROOT - name: install dependencies shell: powershell - run: & apm ci + run: apm ci - name: run tests shell: powershell run: | From cae7f53887068f77cccc6abc5c4c4157bb0a072a Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Mon, 7 Oct 2019 15:27:00 -0400 Subject: [PATCH 15/37] Rename it to "ci" because it's shorter --- .github/workflows/{push.yml => ci.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{push.yml => ci.yml} (99%) diff --git a/.github/workflows/push.yml b/.github/workflows/ci.yml similarity index 99% rename from .github/workflows/push.yml rename to .github/workflows/ci.yml index 68804423f7..a588f5df5b 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: Continuous integration +name: ci on: push: branches: From de23423ec3285cbe3f5aa58ee2b5791795d739e7 Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Mon, 7 Oct 2019 15:37:46 -0400 Subject: [PATCH 16/37] Fix up variable exporting syntax --- .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 a588f5df5b..44d819f0e7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -107,8 +107,8 @@ jobs: run: | Set-StrictMode -Version Latest $script:ATOMROOT = "$env:GITHUB_WORKSPACE/atom" - Write-Host "::set-env name=ATOMROOT $script:ATOMROOT" - Write-Host "::add-path $script:ATOMROOT\Atom Dev\resources\cli\" + Write-Host "::set-env name=ATOMROOT,::$script:ATOMROOT" + Write-Host "::add-path::$script:ATOMROOT\Atom Dev\resources\cli\" Write-Host "Downloading latest Atom release" $source = "https://atom.io/download/windows_zip?channel=dev" From 5ef1b4f112ffd2f9bf9d8163fd37831031e2dc59 Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Mon, 7 Oct 2019 16:51:54 -0400 Subject: [PATCH 17/37] Add msbuild path --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 44d819f0e7..4ad955dcc1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -109,6 +109,7 @@ jobs: $script:ATOMROOT = "$env:GITHUB_WORKSPACE/atom" Write-Host "::set-env name=ATOMROOT,::$script:ATOMROOT" Write-Host "::add-path::$script:ATOMROOT\Atom Dev\resources\cli\" + Write-Host "::add-path::C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\\MSBuild\Current\Bin" Write-Host "Downloading latest Atom release" $source = "https://atom.io/download/windows_zip?channel=dev" From 1fb7924a32054635f4f0eb489ba926f84659c07e Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Mon, 7 Oct 2019 17:51:43 -0400 Subject: [PATCH 18/37] Try an older Windows image --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4ad955dcc1..896c6feb67 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -95,7 +95,7 @@ jobs: windows-tests: name: Windows tests - runs-on: windows-2019 + runs-on: windows-2016 env: ATOM_GITHUB_BABEL_ENV: coverage MOCHA_TIMEOUT: 60000 From 90901b7a5ec8aa2618cafbce8b05c04480449a3f Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Mon, 7 Oct 2019 18:27:28 -0400 Subject: [PATCH 19/37] Set VCTargetsPath --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 896c6feb67..cfcfb5e027 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -100,6 +100,7 @@ jobs: ATOM_GITHUB_BABEL_ENV: coverage MOCHA_TIMEOUT: 60000 UNTIL_TIMEOUT: 30000 + VCTargetsPath: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Microsoft.Cpp\v4.0\V120' steps: - uses: actions/checkout@v1 - name: install Atom @@ -109,7 +110,7 @@ jobs: $script:ATOMROOT = "$env:GITHUB_WORKSPACE/atom" Write-Host "::set-env name=ATOMROOT,::$script:ATOMROOT" Write-Host "::add-path::$script:ATOMROOT\Atom Dev\resources\cli\" - Write-Host "::add-path::C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\\MSBuild\Current\Bin" + Write-Host "::add-path::C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin" Write-Host "Downloading latest Atom release" $source = "https://atom.io/download/windows_zip?channel=dev" From ef59098b282a89752066030da46d32b0d37bc7c4 Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Mon, 7 Oct 2019 19:41:53 -0400 Subject: [PATCH 20/37] List matching directories under MSBuild --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cfcfb5e027..eaa4225892 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -112,6 +112,8 @@ jobs: Write-Host "::add-path::$script:ATOMROOT\Atom Dev\resources\cli\" Write-Host "::add-path::C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin" + Get-ChildItem -Path "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\" -Recurse -Filter "*Microsoft.Cpp" + Write-Host "Downloading latest Atom release" $source = "https://atom.io/download/windows_zip?channel=dev" $destination = "atom.zip" From b30b8ad09a13e268d2b5c0bde8dd6e4490343dee Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Mon, 7 Oct 2019 19:43:42 -0400 Subject: [PATCH 21/37] Wait is it 2017 --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eaa4225892..a8b7ad229f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -100,7 +100,7 @@ jobs: ATOM_GITHUB_BABEL_ENV: coverage MOCHA_TIMEOUT: 60000 UNTIL_TIMEOUT: 30000 - VCTargetsPath: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Microsoft.Cpp\v4.0\V120' + VCTargetsPath: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\Microsoft.Cpp\v4.0\V120' steps: - uses: actions/checkout@v1 - name: install Atom @@ -110,9 +110,9 @@ jobs: $script:ATOMROOT = "$env:GITHUB_WORKSPACE/atom" Write-Host "::set-env name=ATOMROOT,::$script:ATOMROOT" Write-Host "::add-path::$script:ATOMROOT\Atom Dev\resources\cli\" - Write-Host "::add-path::C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin" + Write-Host "::add-path::C:\Program Files (x86)\Microsoft Visual Studio\2079\Enterprise\MSBuild\Current\Bin" - Get-ChildItem -Path "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\" -Recurse -Filter "*Microsoft.Cpp" + Get-ChildItem -Path "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild" -Recurse -Filter "*Microsoft.Cpp" Write-Host "Downloading latest Atom release" $source = "https://atom.io/download/windows_zip?channel=dev" From 12edf0ef537e9b648ac3a7db19c1bbd7702393c1 Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Mon, 7 Oct 2019 19:52:56 -0400 Subject: [PATCH 22/37] Actually output --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a8b7ad229f..1a11ae3d97 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -112,7 +112,7 @@ jobs: Write-Host "::add-path::$script:ATOMROOT\Atom Dev\resources\cli\" Write-Host "::add-path::C:\Program Files (x86)\Microsoft Visual Studio\2079\Enterprise\MSBuild\Current\Bin" - Get-ChildItem -Path "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild" -Recurse -Filter "*Microsoft.Cpp" + Get-ChildItem -Path "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild" -Recurse -Filter "*Microsoft.Cpp" | ForEach-Object { Write-Host $_ } Write-Host "Downloading latest Atom release" $source = "https://atom.io/download/windows_zip?channel=dev" From f4214f147abb15604f4af740ac52e29934c25dc2 Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Mon, 7 Oct 2019 20:07:40 -0400 Subject: [PATCH 23/37] Lowercase for prettier names --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1a11ae3d97..201e91179f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ on: - synchronize jobs: linux-tests: - name: Linux tests + name: linux tests runs-on: ubuntu-18.04 env: DISPLAY: ":99" @@ -55,7 +55,7 @@ jobs: if: success() || failure() macos-tests: - name: MacOS tests + name: macos tests runs-on: macos-10.14 env: ATOM_GITHUB_BABEL_ENV: coverage @@ -94,7 +94,7 @@ jobs: if: success() || failure() windows-tests: - name: Windows tests + name: windows tests runs-on: windows-2016 env: ATOM_GITHUB_BABEL_ENV: coverage @@ -148,7 +148,7 @@ jobs: if: success() || failure() lint: - name: Lint + name: lint runs-on: ubuntu-18.04 env: DISPLAY: ":99" @@ -176,7 +176,7 @@ jobs: run: npm run lint snapshot-tests: - name: Snapshot tests + name: snapshot tests runs-on: ubuntu-18.04 env: DISPLAY: ":99" From 43a897ff9060f9cdded57a030d3dd91ead2a8cd1 Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Mon, 7 Oct 2019 20:08:03 -0400 Subject: [PATCH 24/37] Write all directories --- .github/workflows/ci.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 201e91179f..240beb6314 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -112,14 +112,16 @@ jobs: Write-Host "::add-path::$script:ATOMROOT\Atom Dev\resources\cli\" Write-Host "::add-path::C:\Program Files (x86)\Microsoft Visual Studio\2079\Enterprise\MSBuild\Current\Bin" - Get-ChildItem -Path "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild" -Recurse -Filter "*Microsoft.Cpp" | ForEach-Object { Write-Host $_ } + Write-Host "Starting enumeration:" + Get-ChildItem -Path "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild" -Recurse -Directory | ForEach-Object { Write-Host $_.FullName } + Write-Host "Enumeration complete" Write-Host "Downloading latest Atom release" $source = "https://atom.io/download/windows_zip?channel=dev" $destination = "atom.zip" - (New-Object System.Net.WebClient).DownloadFile($source, $destination) - Expand-Archive -Path "atom.zip" -DestinationPath $script:ATOMROOT + # (New-Object System.Net.WebClient).DownloadFile($source, $destination) + # Expand-Archive -Path "atom.zip" -DestinationPath $script:ATOMROOT - name: install dependencies shell: powershell run: apm ci From 25e164ffffaa049bc1687092e576a8f207c2845e Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Mon, 7 Oct 2019 20:21:15 -0400 Subject: [PATCH 25/37] More path tweaking --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 240beb6314..bd10c0785d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -100,7 +100,7 @@ jobs: ATOM_GITHUB_BABEL_ENV: coverage MOCHA_TIMEOUT: 60000 UNTIL_TIMEOUT: 30000 - VCTargetsPath: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\Microsoft.Cpp\v4.0\V120' + VCTargetsPath: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Common7\VC\VCTargets' steps: - uses: actions/checkout@v1 - name: install Atom @@ -110,10 +110,10 @@ jobs: $script:ATOMROOT = "$env:GITHUB_WORKSPACE/atom" Write-Host "::set-env name=ATOMROOT,::$script:ATOMROOT" Write-Host "::add-path::$script:ATOMROOT\Atom Dev\resources\cli\" - Write-Host "::add-path::C:\Program Files (x86)\Microsoft Visual Studio\2079\Enterprise\MSBuild\Current\Bin" + Write-Host "::add-path::C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\Current\Bin" Write-Host "Starting enumeration:" - Get-ChildItem -Path "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild" -Recurse -Directory | ForEach-Object { Write-Host $_.FullName } + Get-ChildItem -Path "C:\Program Files (x86)\Microsoft Visual Studio\2017\Common7\VC\VCTargets" -Recurse -Directory | ForEach-Object { Write-Host $_.FullName } Write-Host "Enumeration complete" Write-Host "Downloading latest Atom release" From 493cd8a2a6d31d972a6b41a54f6a316de380d48e Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Mon, 7 Oct 2019 20:23:32 -0400 Subject: [PATCH 26/37] Missed a directory --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bd10c0785d..2025ed580c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -100,7 +100,7 @@ jobs: ATOM_GITHUB_BABEL_ENV: coverage MOCHA_TIMEOUT: 60000 UNTIL_TIMEOUT: 30000 - VCTargetsPath: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Common7\VC\VCTargets' + VCTargetsPath: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Common7\IDE\VC\VCTargets' steps: - uses: actions/checkout@v1 - name: install Atom @@ -113,15 +113,15 @@ jobs: Write-Host "::add-path::C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\Current\Bin" Write-Host "Starting enumeration:" - Get-ChildItem -Path "C:\Program Files (x86)\Microsoft Visual Studio\2017\Common7\VC\VCTargets" -Recurse -Directory | ForEach-Object { Write-Host $_.FullName } + Get-ChildItem -Path "C:\Program Files (x86)\Microsoft Visual Studio\2017\Common7\IDE\VC\VCTargets" -Recurse -Directory | ForEach-Object { Write-Host $_.FullName } Write-Host "Enumeration complete" Write-Host "Downloading latest Atom release" $source = "https://atom.io/download/windows_zip?channel=dev" $destination = "atom.zip" - # (New-Object System.Net.WebClient).DownloadFile($source, $destination) - # Expand-Archive -Path "atom.zip" -DestinationPath $script:ATOMROOT + (New-Object System.Net.WebClient).DownloadFile($source, $destination) + Expand-Archive -Path "atom.zip" -DestinationPath $script:ATOMROOT - name: install dependencies shell: powershell run: apm ci From d161c6725cdbe2b5676a5ed17680d26e5675c667 Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Mon, 7 Oct 2019 20:25:51 -0400 Subject: [PATCH 27/37] Derp derp --- .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 2025ed580c..48cea925b1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -100,7 +100,7 @@ jobs: ATOM_GITHUB_BABEL_ENV: coverage MOCHA_TIMEOUT: 60000 UNTIL_TIMEOUT: 30000 - VCTargetsPath: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Common7\IDE\VC\VCTargets' + VCTargetsPath: C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\VC\VCTargets' steps: - uses: actions/checkout@v1 - name: install Atom @@ -113,7 +113,7 @@ jobs: Write-Host "::add-path::C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\Current\Bin" Write-Host "Starting enumeration:" - Get-ChildItem -Path "C:\Program Files (x86)\Microsoft Visual Studio\2017\Common7\IDE\VC\VCTargets" -Recurse -Directory | ForEach-Object { Write-Host $_.FullName } + Get-ChildItem -Path "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\" -Recurse -Directory | ForEach-Object { Write-Host $_.FullName } Write-Host "Enumeration complete" Write-Host "Downloading latest Atom release" From 52858791c9f8ccc98ecb0af8cad1aa204b64580b Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Mon, 7 Oct 2019 20:28:32 -0400 Subject: [PATCH 28/37] Bad quotes i guess --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 48cea925b1..1279f3e2c9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -100,7 +100,7 @@ jobs: ATOM_GITHUB_BABEL_ENV: coverage MOCHA_TIMEOUT: 60000 UNTIL_TIMEOUT: 30000 - VCTargetsPath: C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\VC\VCTargets' + VCTargetsPath: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\VC\VCTargets' steps: - uses: actions/checkout@v1 - name: install Atom From a7bebdb89db9cf3746d21fef507e7c17a60d465c Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Mon, 7 Oct 2019 20:39:29 -0400 Subject: [PATCH 29/37] Tell node-gyp what visual studio version we're using --- .github/workflows/ci.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1279f3e2c9..3998700161 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -112,9 +112,11 @@ jobs: Write-Host "::add-path::$script:ATOMROOT\Atom Dev\resources\cli\" Write-Host "::add-path::C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\Current\Bin" - Write-Host "Starting enumeration:" - Get-ChildItem -Path "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\" -Recurse -Directory | ForEach-Object { Write-Host $_.FullName } - Write-Host "Enumeration complete" + npm config set msvs_version 2017 + + # Write-Host "Starting enumeration:" + # Get-ChildItem -Path "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\" -Recurse -Directory | ForEach-Object { Write-Host $_.FullName } + # Write-Host "Enumeration complete" Write-Host "Downloading latest Atom release" $source = "https://atom.io/download/windows_zip?channel=dev" From cedb65c6428cf4449f41a2ebd0f1d9a864235e52 Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Mon, 7 Oct 2019 20:47:56 -0400 Subject: [PATCH 30/37] Let's try -g --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3998700161..b1ab15a8c7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -110,9 +110,8 @@ jobs: $script:ATOMROOT = "$env:GITHUB_WORKSPACE/atom" Write-Host "::set-env name=ATOMROOT,::$script:ATOMROOT" Write-Host "::add-path::$script:ATOMROOT\Atom Dev\resources\cli\" - Write-Host "::add-path::C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\Current\Bin" - npm config set msvs_version 2017 + npm config set msvs_version 2017 -g # Write-Host "Starting enumeration:" # Get-ChildItem -Path "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\" -Recurse -Directory | ForEach-Object { Write-Host $_.FullName } From eff24c9b9c3ce9b9e76f85ded4a29ccaf57775a6 Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Tue, 8 Oct 2019 09:12:17 -0400 Subject: [PATCH 31/37] Use `apm config` instead of `npm config` --- .github/workflows/ci.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b1ab15a8c7..db77744cfd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -111,12 +111,6 @@ jobs: Write-Host "::set-env name=ATOMROOT,::$script:ATOMROOT" Write-Host "::add-path::$script:ATOMROOT\Atom Dev\resources\cli\" - npm config set msvs_version 2017 -g - - # Write-Host "Starting enumeration:" - # Get-ChildItem -Path "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\" -Recurse -Directory | ForEach-Object { Write-Host $_.FullName } - # Write-Host "Enumeration complete" - Write-Host "Downloading latest Atom release" $source = "https://atom.io/download/windows_zip?channel=dev" $destination = "atom.zip" @@ -125,7 +119,9 @@ jobs: Expand-Archive -Path "atom.zip" -DestinationPath $script:ATOMROOT - name: install dependencies shell: powershell - run: apm ci + run: | + apm config set msvs_version 2017 + apm ci - name: run tests shell: powershell run: | From 5d7990358a5fba5eb068ae54ed37dd4748c6ad59 Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Tue, 8 Oct 2019 09:21:08 -0400 Subject: [PATCH 32/37] Dump apm and npm configs --- .github/workflows/ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index db77744cfd..b371023348 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -121,6 +121,12 @@ jobs: shell: powershell run: | apm config set msvs_version 2017 + Write-Host "apm config:" + apm config list + Write-Host "---" + Write-Host "npm config:" + npm config list + Write-Host "---" apm ci - name: run tests shell: powershell From 258620a2dce3a6490d920b6de78177eca1d9c54e Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Fri, 15 Nov 2019 14:42:54 -0500 Subject: [PATCH 33/37] Wipe the AZP config --- azure-pipelines.yml | 192 +------------------------------------------- 1 file changed, 2 insertions(+), 190 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f32faac8d2..0cc1c17930 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -9,196 +9,8 @@ pr: - '*' jobs: -- job: Linux +- job: nah pool: vmImage: ubuntu-16.04 - variables: - display: ":99" - atom_channel: dev - atom_name: atom-dev steps: - - template: script/azure-pipelines/linux-install.yml - parameters: - atom_channel: $(atom_channel) - atom_name: $(atom_name) - - bash: | - "/tmp/atom/usr/bin/${ATOM_NAME}" --test test/ - displayName: run tests - env: - TEST_JUNIT_XML_PATH: $(Agent.HomeDirectory)/test-results.xml - ATOM_GITHUB_BABEL_ENV: coverage - FORCE_COLOR: 0 - MOCHA_TIMEOUT: 60000 - UNTIL_TIMEOUT: 30000 - - task: PublishTestResults@2 - inputs: - testResultsFormat: JUnit - testResultsFiles: $(Agent.HomeDirectory)/test-results.xml - testRunTitle: Linux $(atom_channel) - condition: succeededOrFailed() - - bash: npm run report:coverage - displayName: generate code coverage reports - condition: succeededOrFailed() - - bash: > - bash <(curl -s https://codecov.io/bash) - -n "Linux $(atom_channel)" - -P "${SYSTEM_PULLREQUEST_PULLREQUESTNUMBER:-}" - -B "${SYSTEM_PULLREQUEST_SOURCEBRANCH:-${BUILD_SOURCEBRANCH}}" - displayName: publish code coverage to CodeCov - env: - CODECOV_TOKEN: $(codecov.token) - condition: succeededOrFailed() - - task: PublishCodeCoverageResults@1 - inputs: - codeCoverageTool: cobertura - summaryFileLocation: $(System.DefaultWorkingDirectory)/coverage/cobertura-coverage.xml - reportDirectory: $(System.DefaultworkingDirectory)/coverage/ - condition: succeededOrFailed() - -- job: MacOS - pool: - vmImage: macos-10.13 - variables: - atom_channel: dev - atom_app: Atom Dev.app - steps: - - template: script/azure-pipelines/macos-install.yml - parameters: - atom_channel: $(atom_channel) - atom_app: $(atom_app) - - bash: | - "/tmp/atom/${ATOM_APP}/Contents/Resources/app/atom.sh" --test test/ - displayName: run tests - env: - TEST_JUNIT_XML_PATH: $(Agent.HomeDirectory)/test-results.xml - ATOM_GITHUB_BABEL_ENV: coverage - FORCE_COLOR: 0 - MOCHA_TIMEOUT: 60000 - UNTIL_TIMEOUT: 30000 - - task: PublishTestResults@2 - inputs: - testResultsFormat: JUnit - testResultsFiles: $(Agent.HomeDirectory)/test-results.xml - testRunTitle: MacOS $(atom_channel) - condition: succeededOrFailed() - - bash: npm run report:coverage - displayName: generate code coverage reports - condition: succeededOrFailed() - - bash: > - bash <(curl -s https://codecov.io/bash) - -n "MacOS $(atom_channel)" - -P "${SYSTEM_PULLREQUEST_PULLREQUESTNUMBER:-}" - -B "${SYSTEM_PULLREQUEST_SOURCEBRANCH:-${BUILD_SOURCEBRANCH}}" - displayName: publish code coverage to CodeCov - env: - CODECOV_TOKEN: $(codecov.token) - condition: succeededOrFailed() - - task: PublishCodeCoverageResults@1 - inputs: - codeCoverageTool: cobertura - summaryFileLocation: $(System.DefaultWorkingDirectory)/coverage/cobertura-coverage.xml - reportDirectory: $(System.DefaultworkingDirectory)/coverage/ - condition: succeededOrFailed() - -- job: Windows - pool: - vmImage: vs2015-win2012r2 - variables: - atom_channel: dev - atom_directory: Atom Dev - steps: - - template: script/azure-pipelines/windows-install.yml - parameters: - atom_channel: $(atom_channel) - atom_directory: $(atom_directory) - - powershell: | - Set-StrictMode -Version Latest - $script:ATOMROOT = "$env:AGENT_HOMEDIRECTORY/atom" - $script:ATOM_SCRIPT_PATH = "$script:ATOMROOT\$env:ATOM_DIRECTORY\resources\cli\atom.cmd" - - # Normalize %TEMP% as a long (non 8.3) path. - $env:TEMP = (Get-Item -LiteralPath $env:TEMP).FullName - - $env:ELECTRON_NO_ATTACH_CONSOLE = "true" - [Environment]::SetEnvironmentVariable("ELECTRON_NO_ATTACH_CONSOLE", "true", "User") - $env:ELECTRON_ENABLE_LOGGING = "YES" - [Environment]::SetEnvironmentVariable("ELECTRON_ENABLE_LOGGING", "YES", "User") - - Write-Host "Running tests" - & "$script:ATOM_SCRIPT_PATH" --test test 2>&1 | %{ "$_" } - - if ($LASTEXITCODE -ne 0) { - Write-Host "Specs Failed" - $host.SetShouldExit($LASTEXITCODE) - exit - } - displayName: run tests - env: - TEST_JUNIT_XML_PATH: $(Agent.HomeDirectory)/test-results.xml - ATOM_GITHUB_BABEL_ENV: coverage - ATOM_GITHUB_SKIP_SYMLINKS: 1 - FORCE_COLOR: 0 - MOCHA_TIMEOUT: 60000 - UNTIL_TIMEOUT: 30000 - - task: PublishTestResults@2 - inputs: - testResultsFormat: JUnit - testResultsFiles: $(Agent.HomeDirectory)/test-results.xmlq - testRunTitle: Windows $(atom_channel) - condition: succeededOrFailed() - - powershell: npm run report:coverage - displayName: generate code coverage reports - condition: succeededOrFailed() - - bash: > - bash <(curl -s https://codecov.io/bash) - -n "Windows $(atom_channel)" - -P "${SYSTEM_PULLREQUEST_PULLREQUESTNUMBER:-}" - -B "${SYSTEM_PULLREQUEST_SOURCEBRANCH:-${BUILD_SOURCEBRANCH}}" - displayName: publish code coverage to CodeCov - env: - CODECOV_TOKEN: $(codecov.token) - condition: succeededOrFailed() - - task: PublishCodeCoverageResults@1 - inputs: - codeCoverageTool: cobertura - summaryFileLocation: $(System.DefaultWorkingDirectory)/coverage/cobertura-coverage.xml - reportDirectory: $(System.DefaultworkingDirectory)/coverage/ - condition: succeededOrFailed() - -- job: Lint - pool: - vmImage: ubuntu-16.04 - variables: - display: ":99" - atom_channel: dev - steps: - - template: script/azure-pipelines/linux-install.yml - parameters: - atom_channel: $(atom_channel) - atom_name: atom-dev - - bash: /tmp/atom/usr/share/atom-dev/resources/app/apm/node_modules/.bin/npm run lint - displayName: run the linter - -- job: Snapshot - pool: - vmImage: ubuntu-16.04 - variables: - display: ":99" - atom_channel: dev - steps: - - template: script/azure-pipelines/linux-install.yml - parameters: - atom_channel: $(atom_channel) - atom_name: atom-dev - - bash: /tmp/atom/usr/bin/atom-dev --test test/ - displayName: run tests - env: - ATOM_GITHUB_TEST_SUITE: snapshot - TEST_JUNIT_XML_PATH: $(Agent.HomeDirectory)/test-results.xml - FORCE_COLOR: 0 - - task: PublishTestResults@2 - inputs: - testResultsFormat: JUnit - testResultsFiles: $(Agent.HomeDirectory)/test-results.xml - testRunTitle: Snapshot - condition: succeededOrFailed() + - bash: echo nah From 6d33d9309848c450bf6de6cd09faa5140690f301 Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Tue, 14 Apr 2020 21:38:46 -0400 Subject: [PATCH 34/37] Scrap Windows tests for now --- .github/workflows/ci.yml | 59 ---------------------------------------- 1 file changed, 59 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b371023348..4bc5f261e3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -93,65 +93,6 @@ jobs: -B "${SYSTEM_PULLREQUEST_SOURCEBRANCH:-${BUILD_SOURCEBRANCH}}" if: success() || failure() - windows-tests: - name: windows tests - runs-on: windows-2016 - env: - ATOM_GITHUB_BABEL_ENV: coverage - MOCHA_TIMEOUT: 60000 - UNTIL_TIMEOUT: 30000 - VCTargetsPath: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\VC\VCTargets' - steps: - - uses: actions/checkout@v1 - - name: install Atom - shell: powershell - run: | - Set-StrictMode -Version Latest - $script:ATOMROOT = "$env:GITHUB_WORKSPACE/atom" - Write-Host "::set-env name=ATOMROOT,::$script:ATOMROOT" - Write-Host "::add-path::$script:ATOMROOT\Atom Dev\resources\cli\" - - Write-Host "Downloading latest Atom release" - $source = "https://atom.io/download/windows_zip?channel=dev" - $destination = "atom.zip" - - (New-Object System.Net.WebClient).DownloadFile($source, $destination) - Expand-Archive -Path "atom.zip" -DestinationPath $script:ATOMROOT - - name: install dependencies - shell: powershell - run: | - apm config set msvs_version 2017 - Write-Host "apm config:" - apm config list - Write-Host "---" - Write-Host "npm config:" - npm config list - Write-Host "---" - apm ci - - name: run tests - shell: powershell - run: | - # Normalize %TEMP% as a long (non 8.3) path. - $env:TEMP = (Get-Item -LiteralPath $env:TEMP).FullName - $env:ELECTRON_NO_ATTACH_CONSOLE = "true" - - Write-Host "Running tests" - & atom --test test 2>&1 | %{ "$_" } - - name: report code coverage - shell: bash - env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - SYSTEM_PULLREQUEST_PULLREQUESTNUMBER: ${{ github.event.number }} - SYSTEM_PULLREQUEST_SOURCEBRANCH: ${{ github.head_ref }} - BUILD_SOURCEBRANCH: ${{ github.event.ref }} - run: | - npm run report:coverage - bash <(curl -s https://codecov.io/bash) \ - -n "macOS" \ - -P "${SYSTEM_PULLREQUEST_PULLREQUESTNUMBER:-}" \ - -B "${SYSTEM_PULLREQUEST_SOURCEBRANCH:-${BUILD_SOURCEBRANCH}}" - if: success() || failure() - lint: name: lint runs-on: ubuntu-18.04 From 32a20925e9aeb7646d7ad690581cbdfcb48aa652 Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Wed, 15 Apr 2020 08:26:37 -0400 Subject: [PATCH 35/37] Use the nightly channel instead of dev --- .github/workflows/ci.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4bc5f261e3..99ecebd9bf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: - name: install Atom shell: bash run: | - curl -s -L https://atom.io/download/deb?channel=dev \ + curl -s -L https://atom.io/download/deb?channel=nightly \ -H 'Accept: application/octet-stream' \ -o /tmp/atom-amd64.deb /sbin/start-stop-daemon --start --quiet \ @@ -35,10 +35,10 @@ jobs: dpkg-deb -x /tmp/atom-amd64.deb /tmp/atom - name: install dependencies shell: bash - run: /tmp/atom/usr/share/atom-dev/resources/app/apm/bin/apm ci + run: /tmp/atom/usr/share/atom-nightly/resources/app/apm/bin/apm ci - name: run tests shell: bash - run: /tmp/atom/usr/bin/atom-dev --test test/ + run: /tmp/atom/usr/bin/atom-nightly --test test/ - name: report code coverage shell: bash env: @@ -66,18 +66,18 @@ jobs: - name: install Atom shell: bash run: | - curl -s -L https://atom.io/download/mac?channel=dev \ + curl -s -L https://atom.io/download/mac?channel=nightly \ -H 'Accept: application/octet-stream' \ -o /tmp/atom.zip sudo unzip -q /tmp/atom.zip -d /tmp/atom - name: install dependencies shell: bash run: | - '/tmp/atom/Atom Dev.app/Contents/Resources/app/apm/bin/apm' ci + '/tmp/atom/Atom Nightly.app/Contents/Resources/app/apm/bin/apm' ci - name: run tests shell: bash run: | - '/tmp/atom/Atom Dev.app/Contents/Resources/app/atom.sh' --test test/ + '/tmp/atom/Atom Nightly.app/Contents/Resources/app/atom.sh' --test test/ - name: report code coverage shell: bash env: @@ -103,7 +103,7 @@ jobs: - name: install Atom shell: bash run: | - curl -s -L https://atom.io/download/deb?channel=dev \ + curl -s -L https://atom.io/download/deb?channel=nightly \ -H 'Accept: application/octet-stream' \ -o /tmp/atom-amd64.deb /sbin/start-stop-daemon --start --quiet \ @@ -116,7 +116,7 @@ jobs: dpkg-deb -x /tmp/atom-amd64.deb /tmp/atom - name: install dependencies shell: bash - run: /tmp/atom/usr/share/atom-dev/resources/app/apm/bin/apm ci + run: /tmp/atom/usr/share/atom-nightly/resources/app/apm/bin/apm ci - name: lint shell: bash run: npm run lint @@ -133,7 +133,7 @@ jobs: - name: install Atom shell: bash run: | - curl -s -L https://atom.io/download/deb?channel=dev \ + curl -s -L https://atom.io/download/deb?channel=nightly \ -H 'Accept: application/octet-stream' \ -o /tmp/atom-amd64.deb /sbin/start-stop-daemon --start --quiet \ @@ -146,7 +146,7 @@ jobs: dpkg-deb -x /tmp/atom-amd64.deb /tmp/atom - name: install dependencies shell: bash - run: /tmp/atom/usr/share/atom-dev/resources/app/apm/bin/apm ci + run: /tmp/atom/usr/share/atom-nightly/resources/app/apm/bin/apm ci - name: run snapshot tests shell: bash - run: /tmp/atom/usr/bin/atom-dev --test test/ + run: /tmp/atom/usr/bin/atom-nightly --test test/ From 5da300c2d42a3fc723c2b52de00fec6cf8859b08 Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Wed, 15 Apr 2020 08:46:28 -0400 Subject: [PATCH 36/37] Link the README to GitHub Actions --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 1468dc3ee1..e43d03aff3 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # Atom GitHub Package -| Build | Code Coverage | Dependencies | -|-------|---------------|--------------| -| [![Build Status](https://dev.azure.com/atom-github/GitHub%20package%20for%20Atom/_apis/build/status/atom.github)](https://dev.azure.com/atom-github/GitHub%20package%20for%20Atom/_build/latest?definitionId=1) | [![codecov](https://codecov.io/gh/atom/github/branch/master/graph/badge.svg)](https://codecov.io/gh/atom/github) | [![Greenkeeper badge](https://badges.greenkeeper.io/atom/github.svg)](https://greenkeeper.io/) [![Dependency Status](https://david-dm.org/atom/github.svg)](https://david-dm.org/atom/github) | +| Build | Code Coverage | +|-------|---------------| +| [![Build Status](https://github.com/atom/github/workflows/ci/badge.svg)](https://github.com/atom/github/actions?query=workflow%3Aci+branch%3Amaster) | [![codecov](https://codecov.io/gh/atom/github/branch/master/graph/badge.svg)](https://codecov.io/gh/atom/github) | The Atom GitHub package provides Git and GitHub integration for Atom. Check out [github.atom.io](https://github.atom.io) for more information. From cdb8a404448c2030d3108ecef0a3d490e8b88d9d Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Wed, 15 Apr 2020 08:49:15 -0400 Subject: [PATCH 37/37] Remove Azure Pipelines builds --- azure-pipelines.yml | 16 ----------- script/azure-pipelines/linux-install.yml | 20 -------------- script/azure-pipelines/macos-install.yml | 19 ------------- script/azure-pipelines/windows-install.yml | 32 ---------------------- 4 files changed, 87 deletions(-) delete mode 100644 azure-pipelines.yml delete mode 100644 script/azure-pipelines/linux-install.yml delete mode 100644 script/azure-pipelines/macos-install.yml delete mode 100644 script/azure-pipelines/windows-install.yml diff --git a/azure-pipelines.yml b/azure-pipelines.yml deleted file mode 100644 index 0cc1c17930..0000000000 --- a/azure-pipelines.yml +++ /dev/null @@ -1,16 +0,0 @@ -trigger: - branches: - include: - - master - - '*-releases' -pr: - branches: - include: - - '*' - -jobs: -- job: nah - pool: - vmImage: ubuntu-16.04 - steps: - - bash: echo nah diff --git a/script/azure-pipelines/linux-install.yml b/script/azure-pipelines/linux-install.yml deleted file mode 100644 index cb3a93d7d0..0000000000 --- a/script/azure-pipelines/linux-install.yml +++ /dev/null @@ -1,20 +0,0 @@ -parameters: - atom_channel: dev - atom_name: atom-dev - -steps: -- bash: | - curl -s -L "https://atom.io/download/deb?channel=${ATOM_CHANNEL}" \ - -H 'Accept: application/octet-stream' \ - -o 'atom-amd64.deb' - /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16 - sudo apt-get update && sudo apt-get install -yyq libgconf-2-4 build-essential git libsecret-1-dev - dpkg-deb -x atom-amd64.deb /tmp/atom - displayName: install Atom - env: - ATOM_CHANNEL: ${{ parameters.atom_channel }} -- bash: | - "/tmp/atom/usr/share/${ATOM_NAME}/resources/app/apm/bin/apm" ci - displayName: install dependencies - env: - ATOM_NAME: ${{ parameters.atom_name }} diff --git a/script/azure-pipelines/macos-install.yml b/script/azure-pipelines/macos-install.yml deleted file mode 100644 index afbbf2e4f2..0000000000 --- a/script/azure-pipelines/macos-install.yml +++ /dev/null @@ -1,19 +0,0 @@ -parameters: - atom_channel: dev - atom_app: Atom Dev.app - -steps: -- bash: | - curl -s -L "https://atom.io/download/mac?channel=${ATOM_CHANNEL}" \ - -H 'Accept: application/octet-stream' \ - -o "atom.zip" - mkdir -p /tmp/atom - unzip -q atom.zip -d /tmp/atom - displayName: install Atom - env: - ATOM_CHANNEL: ${{ parameters.atom_channel }} -- bash: | - "/tmp/atom/${ATOM_APP}/Contents/Resources/app/apm/bin/apm" ci - displayName: install dependencies - env: - ATOM_APP: ${{ parameters.atom_app }} diff --git a/script/azure-pipelines/windows-install.yml b/script/azure-pipelines/windows-install.yml deleted file mode 100644 index bf8a68392a..0000000000 --- a/script/azure-pipelines/windows-install.yml +++ /dev/null @@ -1,32 +0,0 @@ -parameters: - atom_channel: dev - atom_directory: Atom Dev - -steps: -- powershell: | - Set-StrictMode -Version Latest - $script:ATOMROOT = "$env:AGENT_HOMEDIRECTORY/atom" - - Write-Host "Downloading latest Atom release" - $source = "https://atom.io/download/windows_zip?channel=$env:ATOM_CHANNEL" - $destination = "atom.zip" - - (New-Object System.Net.WebClient).DownloadFile($source, $destination) - Expand-Archive -Path "atom.zip" -DestinationPath $script:ATOMROOT - displayName: install Atom - env: - ATOM_CHANNEL: ${{ parameters.atom_channel }} -- powershell: | - Set-StrictMode -Version Latest - $script:ATOMROOT = "$env:AGENT_HOMEDIRECTORY/atom" - $script:APM_SCRIPT_PATH = "$script:ATOMROOT\${env:ATOM_DIRECTORY}\resources\app\apm\bin\apm.cmd" - - & "$script:APM_SCRIPT_PATH" ci - if ($LASTEXITCODE -ne 0) { - Write-Host "Dependency installation failed" - $host.SetShouldExit($LASTEXITCODE) - exit - } - displayName: install dependencies - env: - ATOM_DIRECTORY: ${{ parameters.atom_directory }}