File tree 3 files changed +12
-8
lines changed
3 files changed +12
-8
lines changed Original file line number Diff line number Diff line change @@ -20,13 +20,17 @@ jobs:
20
20
name : Build with Docker using devkitARM
21
21
steps :
22
22
- name : Checkout repo
23
- uses : actions/checkout@v3
23
+ uses : actions/checkout@v4
24
24
with :
25
25
submodules : recursive
26
26
- name : Install tools
27
27
run : |
28
28
sudo apt-get update
29
29
sudo apt-get install p7zip-full python -y
30
+ - name : Silence all git safe directory warnings
31
+ run : |
32
+ git config --system --add safe.directory '*'
33
+ git fetch --prune --unshallow --tags
30
34
- name : Build
31
35
id : build
32
36
run : |
@@ -45,20 +49,20 @@ jobs:
45
49
7z a template.7z "for SDNAND SD card"
46
50
mv template.7z hiyaCFW.7z
47
51
- name : Publish build to GH Actions
48
- uses : actions/upload-artifact@v3
52
+ uses : actions/upload-artifact@main
49
53
with :
50
54
path : hiyaCFW.7z
51
55
name : build
52
56
53
57
# Only run this for non-PR jobs.
54
58
publish_build :
55
59
runs-on : ubuntu-latest
56
- name : Publish build to TWLBot/Builds
60
+ name : Publish build to release
57
61
if : ${{ success() && !startsWith(github.ref, 'refs/pull') }}
58
62
needs : build
59
63
steps :
60
64
- name : Download artifacts
61
- uses : actions/download-artifact@v3
65
+ uses : actions/download-artifact@main
62
66
with :
63
67
name : build
64
68
path : build
Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ include $(DEVKITARM)/ds_rules
15
15
ifneq ($(shell echo $(shell git tag -l --points-at HEAD) | head -c 1) ,)
16
16
GIT_VER := $(shell git tag -l --points-at HEAD)
17
17
else
18
- GIT_VER := $(shell git describe --abbrev=0 --tags) - $( shell git rev-parse --short HEAD )
18
+ GIT_VER := $(shell git describe --tags --match v[0-9] * --abbrev=7 | sed 's/-[0-9] * -g/-/' )
19
19
endif
20
20
21
21
# Ensure version.h exists
Original file line number Diff line number Diff line change @@ -106,7 +106,7 @@ typedef struct
106
106
u8 fileSysType [8 ];
107
107
// Bootcode
108
108
u8 bootCode [448 ];
109
- } fat16 ;
109
+ } __PACKED fat16 ;
110
110
struct
111
111
{
112
112
// FAT32 extended block
@@ -126,7 +126,7 @@ typedef struct
126
126
u8 fileSysType [8 ];
127
127
// Bootcode
128
128
u8 bootCode [420 ];
129
- } fat32 ;
129
+ } __PACKED fat32 ;
130
130
} extBlock ;
131
131
132
132
__PACKED u16 bootSig ;
@@ -345,7 +345,7 @@ bool FAT_InitFiles (bool initCard)
345
345
// Read in boot sector
346
346
bootSec = (BOOT_SEC * ) globalBuffer ;
347
347
CARD_ReadSector (bootSector , bootSec );
348
-
348
+
349
349
// Store required information about the file system
350
350
if (bootSec -> sectorsPerFAT != 0 )
351
351
{
You can’t perform that action at this time.
0 commit comments