Skip to content

Commit ce4c29c

Browse files
authored
Fix build warnings, update workflow file (#41)
1 parent 9be6da4 commit ce4c29c

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

.github/workflows/build.yml

+8-4
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,17 @@ jobs:
2020
name: Build with Docker using devkitARM
2121
steps:
2222
- name: Checkout repo
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2424
with:
2525
submodules: recursive
2626
- name: Install tools
2727
run: |
2828
sudo apt-get update
2929
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
3034
- name: Build
3135
id: build
3236
run: |
@@ -45,20 +49,20 @@ jobs:
4549
7z a template.7z "for SDNAND SD card"
4650
mv template.7z hiyaCFW.7z
4751
- name: Publish build to GH Actions
48-
uses: actions/upload-artifact@v3
52+
uses: actions/upload-artifact@main
4953
with:
5054
path: hiyaCFW.7z
5155
name: build
5256

5357
# Only run this for non-PR jobs.
5458
publish_build:
5559
runs-on: ubuntu-latest
56-
name: Publish build to TWLBot/Builds
60+
name: Publish build to release
5761
if: ${{ success() && !startsWith(github.ref, 'refs/pull') }}
5862
needs: build
5963
steps:
6064
- name: Download artifacts
61-
uses: actions/download-artifact@v3
65+
uses: actions/download-artifact@main
6266
with:
6367
name: build
6468
path: build

arm9/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ include $(DEVKITARM)/ds_rules
1515
ifneq ($(shell echo $(shell git tag -l --points-at HEAD) | head -c 1),)
1616
GIT_VER := $(shell git tag -l --points-at HEAD)
1717
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/-/')
1919
endif
2020

2121
# Ensure version.h exists

bootloader/source/fat.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ typedef struct
106106
u8 fileSysType[8];
107107
// Bootcode
108108
u8 bootCode[448];
109-
} fat16;
109+
} __PACKED fat16;
110110
struct
111111
{
112112
// FAT32 extended block
@@ -126,7 +126,7 @@ typedef struct
126126
u8 fileSysType[8];
127127
// Bootcode
128128
u8 bootCode[420];
129-
} fat32;
129+
} __PACKED fat32;
130130
} extBlock;
131131

132132
__PACKED u16 bootSig;
@@ -345,7 +345,7 @@ bool FAT_InitFiles (bool initCard)
345345
// Read in boot sector
346346
bootSec = (BOOT_SEC*) globalBuffer;
347347
CARD_ReadSector (bootSector, bootSec);
348-
348+
349349
// Store required information about the file system
350350
if (bootSec->sectorsPerFAT != 0)
351351
{

0 commit comments

Comments
 (0)