From af3784ebb62fc80edfe0e25fa70fb9b920d8d2a1 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sun, 25 Apr 2021 22:19:34 +0100 Subject: [PATCH] Add `-DODIN_VERSION_RAW` to Makefile --- .github/workflows/ci.yml | 6 ++++++ Makefile | 1 + 2 files changed, 7 insertions(+) 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)