diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 9ddb8ee83..2b33c45a8 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -93,7 +93,7 @@ jobs: - uses: actions/checkout@v1 - uses: actions/setup-python@v2 with: - python-version: '3.x' + python-version: '3.8.x' - name: Install B2 CLI shell: bash @@ -127,16 +127,23 @@ jobs: BUCKET: ${{ secrets.B2_BUCKET }} DAYS_TO_KEEP: ${{ secrets.B2_DAYS_TO_KEEP }} run: | + echo Authorizing B2 account b2 authorize-account "$APPID" "$APPKEY" - + + echo Uploading artifcates to B2 chmod +x ./ci/upload_create_nightly.sh ./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" macos-amd64 macos_artifacts/ + echo Deleting old artifacts in B2 python3 ci/delete_old_binaries.py "$BUCKET" "$DAYS_TO_KEEP" + echo Creating nightly.json python3 ci/create_nightly_json.py "$BUCKET" > nightly.json + + echo Uploading nightly.json b2 upload-file "$BUCKET" nightly.json nightly.json + echo Clear B2 account info b2 clear-account diff --git a/core/log/multi_logger.odin b/core/log/multi_logger.odin index b4cd8b1a1..55c0f1436 100644 --- a/core/log/multi_logger.odin +++ b/core/log/multi_logger.odin @@ -13,6 +13,8 @@ create_multi_logger :: proc(logs: ..Logger) -> Logger { } destroy_multi_logger :: proc(log : ^Logger) { + data := (^Multi_Logger_Data)(log.data) + delete(data.loggers) free(log.data) log^ = nil_logger() } diff --git a/vendor/sdl2/sdl_keyboard.odin b/vendor/sdl2/sdl_keyboard.odin index 507b549cb..86112863a 100644 --- a/vendor/sdl2/sdl_keyboard.odin +++ b/vendor/sdl2/sdl_keyboard.odin @@ -9,7 +9,7 @@ when ODIN_OS == "freebsd" { foreign import lib "system:SDL2" } Keysym :: struct { 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 */ unused: u32, } @@ -19,12 +19,12 @@ Keysym :: struct { foreign lib { GetKeyboardFocus :: proc() -> ^Window --- GetKeyboardState :: proc(numkeys: ^c.int) -> [^]u8 --- - GetKeyFromScancode :: proc(scancode: Scancode) -> KeyCode --- - GetScancodeFromKey :: proc(key: KeyCode) -> Scancode --- + GetKeyFromScancode :: proc(scancode: Scancode) -> Keycode --- + GetScancodeFromKey :: proc(key: Keycode) -> Scancode --- GetScancodeName :: proc(scancode: Scancode) -> cstring --- GetScancodeFromName :: proc(name: cstring) -> Scancode --- - GetKeyName :: proc(key: KeyCode) -> cstring --- - GetKeyFromName :: proc(name: cstring) -> KeyCode --- + GetKeyName :: proc(key: Keycode) -> cstring --- + GetKeyFromName :: proc(name: cstring) -> Keycode --- StartTextInput :: proc() --- IsTextInputActive :: proc() -> bool --- StopTextInput :: proc() --- diff --git a/vendor/sdl2/sdl_keycode.odin b/vendor/sdl2/sdl_keycode.odin index 2b79d0e47..73637f072 100644 --- a/vendor/sdl2/sdl_keycode.odin +++ b/vendor/sdl2/sdl_keycode.odin @@ -2,11 +2,11 @@ package sdl2 SCANCODE_MASK :: 1<<30 -SCANCODE_TO_KEYCODE :: #force_inline proc "c" (X: Scancode) -> KeyCode { - return KeyCode(i32(X) | SCANCODE_MASK) +SCANCODE_TO_KEYCODE :: #force_inline proc "c" (X: Scancode) -> Keycode { + return Keycode(i32(X) | SCANCODE_MASK) } -KeyCode :: enum i32 { +Keycode :: enum i32 { UNKNOWN = 0, RETURN = '\r',