aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgingerBill <bill@gingerbill.org>2021-04-25 22:19:34 +0100
committergingerBill <bill@gingerbill.org>2021-04-25 22:19:34 +0100
commitaf3784ebb62fc80edfe0e25fa70fb9b920d8d2a1 (patch)
treeb5d05d872ea94a4e5c5f8f8f28be6415c531f741
parentff933ca37ff5c092e9dd6810f4669538854b2a22 (diff)
Add `-DODIN_VERSION_RAW` to Makefile
-rw-r--r--.github/workflows/ci.yml6
-rw-r--r--Makefile1
2 files changed, 7 insertions, 0 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index deaeff48d..f9abf219f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,6 +14,8 @@ jobs:
run: ./odin run examples/demo/demo.odin
- name: Odin check
run: ./odin check examples/demo/demo.odin -vet
+ - name: Odin version
+ run: ./odin version
build_macOS:
runs-on: macos-latest
steps:
@@ -30,6 +32,8 @@ jobs:
run: ./odin run examples/demo/demo.odin
- name: Odin check
run: ./odin check examples/demo/demo.odin -vet
+ - name: Odin version
+ run: ./odin version
build_windows:
runs-on: windows-latest
steps:
@@ -56,5 +60,7 @@ jobs:
run: |
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat
odin check examples/demo/demo.odin -vet
+ - name: Odin version
+ run: ./odin version
diff --git a/Makefile b/Makefile
index 0352cb3a6..0425d17e0 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@ GIT_SHA=$(shell git rev-parse --short HEAD)
DISABLED_WARNINGS=-Wno-switch -Wno-pointer-sign -Wno-tautological-constant-out-of-range-compare -Wno-tautological-compare -Wno-macro-redefined
LDFLAGS=-pthread -ldl -lm -lstdc++
CFLAGS=-std=c++14 -DGIT_SHA=\"$(GIT_SHA)\"
+CFLAGS:=$(CFLAGS) -DODIN_VERSION_RAW=\"dev-$(shell date +"%Y-%m")\"
CC=clang
OS=$(shell uname)