Use arcanemagus/atom-docker-ci

Trying to fix #1910
BetterThanTomorrow · Oct 24, 2022 · 8b7996a · 8b7996a
1 parent 6ea5c3d
commit 8b7996a
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 19 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -123,38 +123,38 @@ jobs:
       APM_TEST_PACKAGES: ''
       ATOM_CHANNEL: 'stable'
     docker:
-      - image: circleci/node:latest
+      - image: arcanemagus/atom-docker-ci
     steps:
       - attach_workspace:
           at: /tmp
       - run:
           name: Restore build
           command: rmdir ~/calva && cp -r /tmp/build ~/calva
-      - run:
-          name: Update system package lists
-          command: sudo apt-get update
-      - run:
-          name: Install some pre-requisite packages
-          command: sudo apt-get --assume-yes --quiet install curl xvfb libasound2 libgbm-dev
+      #- run:
+      #    name: Update system package lists
+      #    command: sudo apt-get update
+      #- run:
+      #    name: Install some pre-requisite packages
+      #    command: sudo apt-get --assume-yes --quiet install curl xvfb libasound2 libgbm-dev
       - run:
           name: Start display server for Atom
           command: /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1024x768x16 +extension RANDR
           background: true
-      - run:
-          name: Download Atom build script
-          command: |
-            cd src/calva-fmt/atom-language-clojure
-            curl -s -OL https://raw.githubusercontent.com/atom/ci/master/build-package.sh
-      - run:
-          name: Make build script executable
-          command: |
-            cd src/calva-fmt/atom-language-clojure
-            chmod u+x build-package.sh
+      #- run:
+      #    name: Download Atom build script
+      #    command: |
+      #      cd src/calva-fmt/atom-language-clojure
+      #      curl -s -OL https://raw.githubusercontent.com/atom/ci/master/build-package.sh
+      #- run:
+      #    name: Make build script executable
+      #    command: |
+      #      cd src/calva-fmt/atom-language-clojure
+      #      chmod u+x build-package.sh
       - run:
           name: Run package tests
           command: |
             cd src/calva-fmt/atom-language-clojure
-            ./build-package.sh
+            ./run-grammar-tests.sh
       - save_cache:
           name: Save dependencies
           key: ts-{{ checksum "package.json" }}-cljs-{{ checksum "shadow-cljs.edn" }}-grammar-{{ checksum "src/calva-fmt/atom-language-clojure/package.json" }}

diff --git a/.gitignore b/.gitignore
@@ -83,4 +83,7 @@ output.calva-repl
 # Calva dev
 clojure.tmLanguage.json
 .cpcache/
-backup/
+backup/
+
+# Calva grammars
+src/calva-fmt/atom-language-clojure/.cache/
diff --git a/src/calva-fmt/atom-language-clojure/.atom/.apm/.apmrc b/src/calva-fmt/atom-language-clojure/.atom/.apm/.apmrc
@@ -0,0 +1,7 @@
+; This file is auto-generated and should not be edited since any
+; modifications will be lost the next time any apm command is run.
+;
+; You should instead edit your .apmrc config located in ~/.atom/.apmrc
+cache = /home/atom/.atom/.apm
+; Hide progress-bar to prevent npm from altering apm console output.
+progress = false
diff --git a/src/calva-fmt/atom-language-clojure/.atom/config.cson b/src/calva-fmt/atom-language-clojure/.atom/config.cson
@@ -0,0 +1 @@
+{}
diff --git a/src/calva-fmt/atom-language-clojure/run-grammar-tests.sh b/src/calva-fmt/atom-language-clojure/run-grammar-tests.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+ATOM_SCRIPT_PATH="apm"
+
+echo "Running specs..."
+"${ATOM_SCRIPT_PATH}" test spec
+
+exit