From 1e2e0562be0bec1a56c4ddb72f12052271874ebf Mon Sep 17 00:00:00 2001 From: Cameron Date: Sat, 1 Jun 2024 21:22:20 +0200 Subject: [PATCH] test ci without token use window, actually try reusing the deps specify OS Add macos runner no mac Add windows to gemlock fix for windows try Use bash shell Cache windows steps put the tests back Windows.... try perms No more windows, this is a pain default perm --- .github/workflows/test.yml | 30 +++++++++--------------------- Gemfile.lock | 1 + tests/init.lua | 3 +++ 3 files changed, 13 insertions(+), 21 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d171d13d..86d4776f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,28 +9,16 @@ on: jobs: test: name: Test - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} strategy: matrix: - release: [v0.10.0, nightly] - os: [ubuntu-latest, windows-latest] + release: [stable, nightly] + os: [ubuntu-latest] env: CI: "1" steps: - uses: actions/checkout@v4 - - uses: actions/checkout@v4 - with: - token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} - repository: nvim-lua/plenary.nvim - path: tmp/plenary/ - - - uses: actions/checkout@v4 - with: - token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} - repository: nvim-telescope/telescope.nvim - path: tmp/telescope/ - - uses: ruby/setup-ruby@v1 with: bundler-cache: true @@ -40,16 +28,16 @@ jobs: neovim: true version: ${{ matrix.release }} + - name: Install Dependencies + run: | + git config --global core.compression 0 + git clone https://github.com/nvim-lua/plenary.nvim tmp/plenary + git clone https://github.com/nvim-telescope/telescope.nvim tmp/telescope + - name: E2E Test run: | bundle exec rspec - - name: Install Dependencies - run: | - mkdir -p ~/.local/share/neogit-test/site/pack/plenary.nvim/start - cd ~/.local/share/neogit-test/site/pack/plenary.nvim/start - git clone https://github.com/nvim-lua/plenary.nvim - - name: Unit Test run: | make test diff --git a/Gemfile.lock b/Gemfile.lock index cf1d4da2..afa12220 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -127,6 +127,7 @@ GEM PLATFORMS arm64-darwin-22 arm64-darwin-23 + x64-mingw-ucrt x86_64-darwin-20 x86_64-linux diff --git a/tests/init.lua b/tests/init.lua index fdfb1c8d..e8dd5130 100644 --- a/tests/init.lua +++ b/tests/init.lua @@ -2,6 +2,9 @@ local util = require("tests.util.util") if os.getenv("CI") then vim.opt.runtimepath:prepend(vim.fn.getcwd()) + vim.opt.runtimepath:prepend(vim.fn.getcwd() .. "/tmp/plenary") + vim.opt.runtimepath:prepend(vim.fn.getcwd() .. "/tmp/telescope") + vim.cmd([[runtime! plugin/plenary.vim]]) vim.cmd([[runtime! plugin/neogit.lua]]) else