This commit is contained in:
gingerBill
2021-10-23 16:52:50 +01:00
4 changed files with 19 additions and 10 deletions
+9 -2
View File
@@ -93,7 +93,7 @@ jobs:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- uses: actions/setup-python@v2 - uses: actions/setup-python@v2
with: with:
python-version: '3.x' python-version: '3.8.x'
- name: Install B2 CLI - name: Install B2 CLI
shell: bash shell: bash
@@ -127,16 +127,23 @@ jobs:
BUCKET: ${{ secrets.B2_BUCKET }} BUCKET: ${{ secrets.B2_BUCKET }}
DAYS_TO_KEEP: ${{ secrets.B2_DAYS_TO_KEEP }} DAYS_TO_KEEP: ${{ secrets.B2_DAYS_TO_KEEP }}
run: | run: |
echo Authorizing B2 account
b2 authorize-account "$APPID" "$APPKEY" b2 authorize-account "$APPID" "$APPKEY"
echo Uploading artifcates to B2
chmod +x ./ci/upload_create_nightly.sh chmod +x ./ci/upload_create_nightly.sh
./ci/upload_create_nightly.sh "$BUCKET" windows-amd64 windows_artifacts/ ./ci/upload_create_nightly.sh "$BUCKET" windows-amd64 windows_artifacts/
./ci/upload_create_nightly.sh "$BUCKET" ubuntu-amd64 ubuntu_artifacts/ ./ci/upload_create_nightly.sh "$BUCKET" ubuntu-amd64 ubuntu_artifacts/
./ci/upload_create_nightly.sh "$BUCKET" macos-amd64 macos_artifacts/ ./ci/upload_create_nightly.sh "$BUCKET" macos-amd64 macos_artifacts/
echo Deleting old artifacts in B2
python3 ci/delete_old_binaries.py "$BUCKET" "$DAYS_TO_KEEP" python3 ci/delete_old_binaries.py "$BUCKET" "$DAYS_TO_KEEP"
echo Creating nightly.json
python3 ci/create_nightly_json.py "$BUCKET" > nightly.json python3 ci/create_nightly_json.py "$BUCKET" > nightly.json
echo Uploading nightly.json
b2 upload-file "$BUCKET" nightly.json nightly.json b2 upload-file "$BUCKET" nightly.json nightly.json
echo Clear B2 account info
b2 clear-account b2 clear-account
+2
View File
@@ -13,6 +13,8 @@ create_multi_logger :: proc(logs: ..Logger) -> Logger {
} }
destroy_multi_logger :: proc(log : ^Logger) { destroy_multi_logger :: proc(log : ^Logger) {
data := (^Multi_Logger_Data)(log.data)
delete(data.loggers)
free(log.data) free(log.data)
log^ = nil_logger() log^ = nil_logger()
} }
+5 -5
View File
@@ -9,7 +9,7 @@ when ODIN_OS == "freebsd" { foreign import lib "system:SDL2" }
Keysym :: struct { Keysym :: struct {
scancode: Scancode, /**< SDL physical key code - see ::SDL_Scancode for details */ scancode: Scancode, /**< SDL physical key code - see ::SDL_Scancode for details */
sym: KeyCode, /**< SDL virtual key code - see ::SDL_KeyCode for details */ sym: Keycode, /**< SDL virtual key code - see ::SDL_Keycode for details */
mod: Keymod, /**< current key modifiers */ mod: Keymod, /**< current key modifiers */
unused: u32, unused: u32,
} }
@@ -19,12 +19,12 @@ Keysym :: struct {
foreign lib { foreign lib {
GetKeyboardFocus :: proc() -> ^Window --- GetKeyboardFocus :: proc() -> ^Window ---
GetKeyboardState :: proc(numkeys: ^c.int) -> [^]u8 --- GetKeyboardState :: proc(numkeys: ^c.int) -> [^]u8 ---
GetKeyFromScancode :: proc(scancode: Scancode) -> KeyCode --- GetKeyFromScancode :: proc(scancode: Scancode) -> Keycode ---
GetScancodeFromKey :: proc(key: KeyCode) -> Scancode --- GetScancodeFromKey :: proc(key: Keycode) -> Scancode ---
GetScancodeName :: proc(scancode: Scancode) -> cstring --- GetScancodeName :: proc(scancode: Scancode) -> cstring ---
GetScancodeFromName :: proc(name: cstring) -> Scancode --- GetScancodeFromName :: proc(name: cstring) -> Scancode ---
GetKeyName :: proc(key: KeyCode) -> cstring --- GetKeyName :: proc(key: Keycode) -> cstring ---
GetKeyFromName :: proc(name: cstring) -> KeyCode --- GetKeyFromName :: proc(name: cstring) -> Keycode ---
StartTextInput :: proc() --- StartTextInput :: proc() ---
IsTextInputActive :: proc() -> bool --- IsTextInputActive :: proc() -> bool ---
StopTextInput :: proc() --- StopTextInput :: proc() ---
+3 -3
View File
@@ -2,11 +2,11 @@ package sdl2
SCANCODE_MASK :: 1<<30 SCANCODE_MASK :: 1<<30
SCANCODE_TO_KEYCODE :: #force_inline proc "c" (X: Scancode) -> KeyCode { SCANCODE_TO_KEYCODE :: #force_inline proc "c" (X: Scancode) -> Keycode {
return KeyCode(i32(X) | SCANCODE_MASK) return Keycode(i32(X) | SCANCODE_MASK)
} }
KeyCode :: enum i32 { Keycode :: enum i32 {
UNKNOWN = 0, UNKNOWN = 0,
RETURN = '\r', RETURN = '\r',