From 88d33d76bf5b231e286c4303a2eec1d01bbc4f97 Mon Sep 17 00:00:00 2001 From: Omay <238maculo238@gmail.com> Date: Thu, 17 Apr 2025 12:13:21 -0600 Subject: [PATCH 1/6] improve gitignore, add missing .keeps --- .gitignore | 4 ++++ build/disk/.keep | 0 build/fs/.keep | 0 build/string/.keep | 0 4 files changed, 4 insertions(+) create mode 100644 build/disk/.keep create mode 100644 build/fs/.keep create mode 100644 build/string/.keep diff --git a/.gitignore b/.gitignore index 45784b0..71453ad 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,5 @@ .qodo +.DS_Store +bin/*.bin +build/*.o +build/**/.o diff --git a/build/disk/.keep b/build/disk/.keep new file mode 100644 index 0000000..e69de29 diff --git a/build/fs/.keep b/build/fs/.keep new file mode 100644 index 0000000..e69de29 diff --git a/build/string/.keep b/build/string/.keep new file mode 100644 index 0000000..e69de29 From c25e9706539c62bf19dd361b9adc70cd9f1616ca Mon Sep 17 00:00:00 2001 From: Omay <238maculo238@gmail.com> Date: Thu, 17 Apr 2025 12:14:13 -0600 Subject: [PATCH 2/6] remove .DS_Store --- .DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index a3585876b6842aef6ec2eca2c673c194487ea3b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~O=`nH427SXECStl+2w30pQvfVyQljO&;ssLc!1UOG})p;=82 zR;?Ceh}WZ?+UmMqI#RP8R>OzYoz15hnq@nzF`-!xQ4j$USP Date: Thu, 17 Apr 2025 12:19:02 -0600 Subject: [PATCH 3/6] fix elf tools download in workflow (probably) --- .github/workflows/makefile.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index 94c6a90..9370597 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -21,10 +21,9 @@ jobs: - name: Download and install i686-elf toolchain run: | - curl -L https://github.com/mitchellh/gcc-i686-elf/releases/download/v1.0.0/i686-elf-ubuntu.tar.gz -o toolchain.tar.gz - mkdir -p $HOME/toolchain - tar -xzf toolchain.tar.gz -C $HOME/toolchain - echo "$HOME/toolchain/i686-elf/bin" >> $GITHUB_PATH + curl -L https://raw.githubusercontent.com/lordmilko/i686-elf-tools/refs/heads/master/i686-elf-tools.sh -o i686-elf-tools.sh + chmod +x i686-elf-tools.sh + ./i686-elf-tools.sh - name: Verify toolchain run: | From 6954ddc47eb52550545ad3adf3b2321e8844e755 Mon Sep 17 00:00:00 2001 From: Leonard Maculo <70179858+Omay238@users.noreply.github.com> Date: Thu, 17 Apr 2025 13:18:01 -0600 Subject: [PATCH 4/6] fix elf (probably) --- .github/workflows/makefile.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index 9370597..f16d378 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -21,9 +21,9 @@ jobs: - name: Download and install i686-elf toolchain run: | - curl -L https://raw.githubusercontent.com/lordmilko/i686-elf-tools/refs/heads/master/i686-elf-tools.sh -o i686-elf-tools.sh - chmod +x i686-elf-tools.sh - ./i686-elf-tools.sh + curl -L https://github.com/lordmilko/i686-elf-tools/releases/download/13.2.0/i686-elf-tools-linux.zip -o i686-elf-tools-linux.zip + mkdir $HOME/i686-elf-tools && unzip i686-elf-tools-linux.zip -d $HOME/i686-elf-tools + echo "$HOME/i686-elf-tools/bin" >> $GITHUB_PATH - name: Verify toolchain run: | From 816e22d1136de9d0d7d7ec4f0cb3424a43b8981d Mon Sep 17 00:00:00 2001 From: Leonard Maculo <70179858+Omay238@users.noreply.github.com> Date: Thu, 17 Apr 2025 13:22:45 -0600 Subject: [PATCH 5/6] remove distcheck --- .github/workflows/makefile.yml | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index f16d378..d23cb2d 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -2,9 +2,15 @@ name: Makefile CI on: push: - branches: [ "main" ] + paths: + - 'Makefile' + - 'build.sh' + - 'src/**' pull_request: - branches: [ "main" ] + paths: + - 'Makefile' + - 'build.sh' + - 'src/**' jobs: build: @@ -22,7 +28,8 @@ jobs: - name: Download and install i686-elf toolchain run: | curl -L https://github.com/lordmilko/i686-elf-tools/releases/download/13.2.0/i686-elf-tools-linux.zip -o i686-elf-tools-linux.zip - mkdir $HOME/i686-elf-tools && unzip i686-elf-tools-linux.zip -d $HOME/i686-elf-tools + mkdir $HOME/i686-elf-tools + unzip i686-elf-tools-linux.zip -d $HOME/i686-elf-tools echo "$HOME/i686-elf-tools/bin" >> $GITHUB_PATH - name: Verify toolchain @@ -31,15 +38,9 @@ jobs: i686-elf-as --version - name: Build project - run: make - - - name: Run distcheck - run: make distcheck - - - name: Prepare output run: | - mkdir -p bin - cp os.bin bin/os.bin + chmod +x build.sh + ./build.sh - name: Upload artifact uses: actions/upload-artifact@v4 From 8ca251eb8651eacd4b68b29fb17c93f593a89190 Mon Sep 17 00:00:00 2001 From: Leonard Maculo <70179858+Omay238@users.noreply.github.com> Date: Thu, 17 Apr 2025 13:23:35 -0600 Subject: [PATCH 6/6] make it run when action changes --- .github/workflows/makefile.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index d23cb2d..baa017f 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -6,11 +6,13 @@ on: - 'Makefile' - 'build.sh' - 'src/**' + - '.github/workflows/makefile.yml' pull_request: paths: - 'Makefile' - 'build.sh' - 'src/**' + - '.github/workflows/makefile.yml' jobs: build: