diff options
| -rw-r--r-- | .github/workflows/ci.yml | 39 | ||||
| -rw-r--r-- | .travis.yml | 36 | ||||
| -rw-r--r-- | Makefile | 22 | ||||
| -rw-r--r-- | README.org | 3 |
4 files changed, 41 insertions, 59 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..4f7c250 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,39 @@ +name: ci + +on: + push: + branches: [main] + pull_request: + branches: [main] + +jobs: + test: + runs-on: ubuntu-latest + continue-on-error: ${{ matrix.emacs_version == 'snapshot' }} + + strategy: + fail-fast: false + matrix: + emacs_version: + - '27.2' + - 'snapshot' + + steps: + - uses: actions/checkout@v2 + + - uses: purcell/setup-emacs@master + with: + version: ${{ matrix.emacs_version }} + + - name: Run tests for scripts + run: | + ./bin/test/test.sh + + - name: Install Doom Emacs + run: | + git clone --depth 1 https://github.com/hlissner/doom-emacs ~/.emacs.d + ~/.emacs.d/bin/doom install + + - name: Check GNU Emacs + run: | + doom doctor diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 1f9df2f..0000000 --- a/.travis.yml +++ /dev/null @@ -1,36 +0,0 @@ -language: nix - -env: - - EMACS_CI=emacs-25-3 - - EMACS_CI=emacs-26-3 - - EMACS_CI=emacs-snapshot - -install: - # mu4e - - sudo apt-get -qq update - - sudo apt-get install -y maildir-utils - - pushd /tmp - - wget https://github.com/djcb/mu/releases/download/v1.0/mu-1.0.tar.xz - - tar xJvf mu-1.0.tar.xz - - sudo cp -r mu-1.0/mu4e /usr/share/emacs/site-lisp/ - - popd - - # GNU Emacs itself through nix. - - bash <(curl https://raw.githubusercontent.com/purcell/nix-emacs-ci/master/travis-install) - - # Install the soria theme, which has been previously downloaded. - - git clone https://github.com/mssola/soria.git - - cp soria/soria-theme.el .emacs.d/soria-theme.el - - # writer-mode - - mkdir -p $HOME/src/github.com/mssola/ - - cd $HOME/src/github.com/mssola/ - - git clone https://github.com/mssola/writer-mode.git - - # Linters: shellcheck (shell) and rubocop (ruby). - - sudo apt-get install -y shellcheck ruby - - gem install rubocop - -script: - - cd $TRAVIS_BUILD_DIR - - make test diff --git a/Makefile b/Makefile deleted file mode 100644 index e8220ae..0000000 --- a/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -all: test - -.PHONY: test -test: vendor emacs scripts lint - -.PHONY: vendor -vendor: - @gem install rubocop - -.PHONY: emacs -emacs: - @lsb_release -a - @cd .emacs.d && ./test-emacs.sh - -.PHONY: scripts -scripts: - @cd bin/test && ./test.sh - -.PHONY: lint -lint: - @find . -name "*.sh" ! -name ".gitcompletion.sh" ! -name ".hgcompletion.sh" -not -path "./.emacs.d/*" -exec shellcheck \{\} \+ - @rubocop @@ -2,7 +2,8 @@ #+AUTHOR: Miquel Sabaté Solà #+EMAIL: mikisabate@gmail.com -Download everything by performing the following command (notice the =--recursive= flag): +Download everything by performing the following command (notice the +=--recursive= flag): #+BEGIN_SRC bash $ git clone --recursive https://github.com/mssola/dotfiles.git |