Skip to content

Commit

Permalink
ci: bump sage and use setup action
Browse files Browse the repository at this point in the history
Get caching for free.
  • Loading branch information
odsod committed Feb 10, 2022
1 parent b9407f0 commit 1d98749
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 33 deletions.
15 changes: 15 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: CI

on:
pull_request:
types: [opened, reopened, synchronize]

jobs:
make:
runs-on: ubuntu-latest
steps:
- name: Setup Sage
uses: einride/sage/actions/setup@master

- name: Make
run: make
21 changes: 0 additions & 21 deletions .github/workflows/go.yml

This file was deleted.

10 changes: 2 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,8 @@ jobs:
release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2.4.0
with:
fetch-depth: 0

- name: Set up Go
uses: actions/setup-go@v2.1.5
with:
go-version: ^1.17
- name: Setup Sage
uses: einride/sage/actions/setup@master

- name: Make
run: make
Expand Down
2 changes: 1 addition & 1 deletion .sage/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ module sage

go 1.17

require go.einride.tech/sage v0.65.1
require go.einride.tech/sage v0.84.0
4 changes: 2 additions & 2 deletions .sage/go.sum
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
go.einride.tech/sage v0.65.1 h1:vrmVqfcn1kfb9HIrHuZZfcWSrLE2cwPLeTSbeSQTHFk=
go.einride.tech/sage v0.65.1/go.mod h1:EzV5uciFX7/2ho8EKB5K9JghOfXIxlzs694b+Tkl5GQ=
go.einride.tech/sage v0.84.0 h1:/Pw9T/wOmCCs3aA5tzid7F+9nauYG1ifp2oHSxAwWLg=
go.einride.tech/sage v0.84.0/go.mod h1:EzV5uciFX7/2ho8EKB5K9JghOfXIxlzs694b+Tkl5GQ=
10 changes: 9 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,17 @@

sagefile := .sage/bin/sagefile

$(sagefile): .sage/go.mod .sage/*.go
.PHONY: $(sagefile)
$(sagefile):
@cd .sage && go mod tidy && go run .

.PHONY: sage
sage: $(sagefile)

.PHONY: update-sage
update-sage:
@cd .sage && go get -d go.einride.tech/sage@latest && go mod tidy && go run .

.PHONY: clean-sage
clean-sage:
@git clean -fdx .sage/tools .sage/bin .sage/build
Expand Down

0 comments on commit 1d98749

Please sign in to comment.