diff options
| -rw-r--r-- | .github/workflows/test-queries.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/update-lockfile.yml | 16 | ||||
| -rw-r--r-- | .github/workflows/update-readme.yml | 14 |
3 files changed, 12 insertions, 20 deletions
diff --git a/.github/workflows/test-queries.yml b/.github/workflows/test-queries.yml index 5c67d503a..5376c739c 100644 --- a/.github/workflows/test-queries.yml +++ b/.github/workflows/test-queries.yml @@ -84,4 +84,4 @@ jobs: run: cp -r ~/AppData/Local/nvim/pack/nvim-treesitter/start/nvim-treesitter/parser/* parser - name: Check query files - run: $NVIM --headless -c "luafile ./scripts/check-queries.lua" -c "q" + run: $NVIM -l scripts/check-queries.lua diff --git a/.github/workflows/update-lockfile.yml b/.github/workflows/update-lockfile.yml index a1b910e3b..e43a3ea59 100644 --- a/.github/workflows/update-lockfile.yml +++ b/.github/workflows/update-lockfile.yml @@ -18,29 +18,25 @@ jobs: env: NVIM_TAG: stable run: | - wget https://github.com/josephburnett/jd/releases/download/v1.6.1/jd-amd64-linux - mv ./jd-amd64-linux /tmp/jd + wget https://github.com/josephburnett/jd/releases/download/v1.7.1/jd-amd64-linux + mv jd-amd64-linux /tmp/jd chmod +x /tmp/jd - sudo apt install libfuse2 - wget https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim.appimage - chmod u+x nvim.appimage - mkdir -p ~/.local/share/nvim/site/pack/nvim-treesitter/start - ln -s $(pwd) ~/.local/share/nvim/site/pack/nvim-treesitter/start + bash scripts/ci-install-${{ matrix.os }}.sh - name: Update parsers env: SKIP_LOCKFILE_UPDATE_FOR_LANGS: "" run: | cp lockfile.json /tmp/old_lockfile.json - ./nvim.appimage --headless -c "luafile ./scripts/write-lockfile.lua" -c "q" + nvim -l scripts/write-lockfile.lua # Pretty print cp lockfile.json /tmp/lockfile.json cat /tmp/lockfile.json | jq --sort-keys > lockfile.json - name: Commit changes run: | - git config user.name "GitHub" - git config user.email "noreply@github.com" + git config user.name 'GitHub' + git config user.email 'noreply@github.com' git add lockfile.json UPDATED_PARSERS=$(/tmp/jd -f merge /tmp/old_lockfile.json lockfile.json | jq -r 'keys | join(", ")') echo "UPDATED_PARSERS=$UPDATED_PARSERS" >> $GITHUB_ENV diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml index c8673a6a0..7b2c80102 100644 --- a/.github/workflows/update-readme.yml +++ b/.github/workflows/update-readme.yml @@ -17,19 +17,15 @@ jobs: env: NVIM_TAG: stable run: | - sudo apt install libfuse2 - wget https://github.com/neovim/neovim/releases/download/${NVIM_TAG}/nvim.appimage - chmod u+x nvim.appimage - mkdir -p ~/.local/share/nvim/site/pack/nvim-treesitter/start - ln -s $(pwd) ~/.local/share/nvim/site/pack/nvim-treesitter/start + bash ./scripts/ci-install-ubuntu-latest.sh - name: Check README run: | - git config user.email "actions@github" - git config user.name "Github Actions" - ./nvim.appimage --headless -c "luafile ./scripts/update-readme.lua" -c "q" || echo "Needs update" + git config user.email 'actions@github' + git config user.name 'Github Actions' + nvim -l scripts/update-readme.lua || echo 'Needs update' git add README.md - git commit -m "Update README" || echo 'No commit necessary!' + git commit -m 'Update README' || echo 'No commit necessary!' git clean -xf - name: Create Pull Request |