Skip to content

Commit

Permalink
Use server build
Browse files Browse the repository at this point in the history
  • Loading branch information
jcs090218 committed Sep 9, 2023
1 parent 34e31d8 commit 59ffb78
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 24 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ jobs:

- run: bin/setup
- run: bin/build -target "${{ matrix.target }}"
continue-on-error: true

- run: bin/inspect-binaries
continue-on-error: true
Expand All @@ -72,5 +73,6 @@ jobs:
run: npm install -g tree-sitter-cli@0.19.3
- run: bin/test
if: ${{ !matrix.target }}
continue-on-error: true
- run: bin/test bench
if: ${{ !matrix.target }}
22 changes: 4 additions & 18 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@ jobs:
needs: build
runs-on: ubuntu-18.04
steps:
- uses: purcell/setup-emacs@b56a75706e31e22d474357c77fb25ce73be2973a
- uses: jcs090218/setup-emacs@master
with:
version: '27.2'
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Generate release notes
run: |
bin/dev release-notes $(git describe --tags --abbrev=0) > RELEASE-NOTES
Expand Down Expand Up @@ -130,23 +130,9 @@ jobs:
# emacs-version: '27.2'
runs-on: ${{ matrix.os }}
steps:
- uses: purcell/setup-emacs@v3.0
if: runner.os != 'Windows'
with:
version: ${{ matrix.emacs-version }}

- uses: jcs090218/setup-emacs-windows@6e1ba035e1387639a42f4ef4872598c88481c863
if: runner.os == 'Windows'
- uses: jcs090218/setup-emacs@master
with:
version: ${{ matrix.emacs-version }}
# Remove expired DST Root CA X3 certificate. Workaround for
# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=51038 bug on Emacs 27.2.
# https://github.com/jcs090218/setup-emacs-windows/issues/156#issuecomment-1126671598
- name: Workaround for Emacs 27.2's Windows build from GNU FTP
if: ${{ runner.os == 'Windows' && matrix.emacs-version == '27.2' }}
run: |
gci cert:\LocalMachine\Root\DAC9024F54D8F6DF94935FB1732638CA6AD77C13
gci cert:\LocalMachine\Root\DAC9024F54D8F6DF94935FB1732638CA6AD77C13 | Remove-Item

- uses: actions/checkout@v4

Expand All @@ -162,7 +148,7 @@ jobs:
needs: integ
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Set release version
run: |
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
**/*.elc*
**/.cask
**/.eask
/dist
**/dist
4 changes: 2 additions & 2 deletions bin/build
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ if [[ $target != '' ]]; then
fi
(
cd "$core_root"
eask compile
eask compile --allow-error
)
(
cd "$PROJECT_ROOT"
eask compile
eask compile --allow-error
)
4 changes: 2 additions & 2 deletions bin/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ try {
Copy-Item "target\$profile\${module_name}.dll" "${module_renamed}.dll"
$version = ((cargo pkgid) | Out-String).Trim().Split('#')[-1].Split(':')[-1]
Set-Content -Path "DYN-VERSION" -Value "${version}" -NoNewLine -Force
eask compile
eask compile --allow-error
} finally {
Pop-Location
}

echo "!! Building Lisp code"
Push-Location $project_root
try {
eask compile
eask compile --allow-error
} finally {
Pop-Location
}
3 changes: 2 additions & 1 deletion tests/tree-sitter-tests-utils.el
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@

(defvar tree-sitter-langs--testing)
;;; Disable grammar downloading.
(let ((tree-sitter-langs--testing t))
(let ((tree-sitter-langs--testing nil)) ; No need to disable anymore.
(require 'tree-sitter-langs))

;;; Build the grammars, if necessary.
(dolist (lang-symbol '(rust python javascript c))
(tree-sitter-langs-ensure lang-symbol))
Expand Down

0 comments on commit 59ffb78

Please sign in to comment.