develop #4

Closed

t3hn3rd wants to merge 0 commits from develop into master

pull from: develop

merge into: Spexeah:master

Spexeah:feature/storage-system

Spexeah:feature/video-refactor

Spexeah:master

Spexeah:feature/documentation

Conversation 1 Commits - Files Changed -

t3hn3rd commented 2025-03-09 22:37:12 +00:00

Owner

Copy Link

Merge of current development track into master.

Merge of current development track into master.

t3hn3rd added 42 commits 2025-03-09 22:37:13 +00:00

Tidied out comments for docgen. ... 439d4ef8ac

Added some documentation to Asuro.pas & ProgManager.

Merge branch 'feature/documentation' into 'develop' ... 4d25ceef77

Tidied up comments for docgen.

Added some documentation to Asuro.pas, ProgManager, AHCI, asfs & ATA_ISR to fix some of the pasdoc/docgen issues.

See merge request spexeah/asuro!22

Changed comments in Asuro.pas when generated ... 33cb042b8c

Changed the Asuro.pas comment to be the standard format in terms of Directory->File (no .pas) for PasDoc gen.

Merge branch 'feature/documentation' into 'develop' ... ad8e80913a

Changed comments in Asuro.pas when generated

Changed the Asuro.pas comment to be the standard format in terms of Directory->File (no .pas) for PasDoc gen.

See merge request spexeah/asuro!23

3 time the charm 2939afa729

Merge branch 'joe/ci-suggestions' into 'develop' ... e69d06ea4f

3 time the charm

See merge request spexeah/asuro!26

Docgen changes ... 34d6873a6a

Changed docgen job to create doc folder, not public for now.

Merge branch 'feature/pipeline-docs-fix' into 'develop' ... 170b93dd69

Docgen changes

See merge request spexeah/asuro!27

Update readme.md b2eee58df4

Merge branch 'feature/readme-update-1' into 'develop' ... 346dc4e4c9

Update readme.md

See merge request spexeah/asuro!29

Added new String functions ... 98481ea1ce

(cherry picked from commit 24c371cab18a9aecb9fe792dcefacbffd847622a)

Merge branch 'cherry-pick-24c371ca' into 'develop' ... 4c5038b001

Added new String functions

See merge request spexeah/asuro!30

Kernel Size Awareness ... 208bda92c8

Modified the linker script + Added an init function to System.pas to be called at system boot, this allows tracking of the Kernel start & end addresses, and thus, allows us to calculate the kernel size.

Compile Script Improvements ... ba6d8037d2

Improved the compile script (compile_sources.sh) to show line numbers on error and generally compile faster.

Merge branch 'feature/compile-script-improvements' into 'develop' ... 595dd4fbac

Compile Script Improvements

See merge request spexeah/asuro!31

Merge branch 'feature/kernel-size-awareness' into 'develop' ... 189526cab8

Kernel Size Awareness

See merge request spexeah/asuro!32

VirtualBox 7 Compatability Changes ... 25df276101

- Created a PowerShell script `virtualbox-wrapper.ps1` to wrap calls to vboxmanage and only exit once the virtual machine has been terminated.
- Updated launch.json to use the PowerShell launch type to launch `virtualbox-wrapper.ps1` with the machine name supplied as an argument.
- Updated `readme.md` to reflect these changes.

Merge pull request 'VirtualBox 7 Compatability Changes' (#1) from feature/virtualbox-7-compatibility into develop ... 07106b9aed

Reviewed-on: #1

DevOps Workflow Improvements ... 5f3de290f3

- `VirtualBox-Wrapper.ps1` now takes 'up' or 'down' as opposed to a machine name. This allows start/stop of a virtualmachine.
- `VirtualBox-Wrapper.ps1` now relies on a gitignored `localenv.json` to work.
- `VirtualBox-Wrapper.ps1` can also optionally monitor the log file generated from the serial adapter in VirtualBox.
- `readme.md` updated to provide instructions on how to populate the `localenv.json` file.
- `tasks.json` updated to have a "Clean" task to --remove-orphans, the Build task depends on this.
- `tasks.json` updated to have a "Close VirtualBox" task, this runs the `virtualbox-wrapper.ps1` in 'down' mode. The Build task depends on this.
- `launch.json` updated to run the `VirtualBox-Wrapper.ps1` with the "-Command up" argument, instead of machine name.
- .gitignore updated to ignore any instances of `localenv.json`.

Merge pull request 'DevOps Workflow Improvements' (#2) from feature/devlops-workflow-improvements into develop ... 80d0183391

Reviewed-on: #2

First attempt at drone cicd migration ... f907b7e072

- Created a new `.drone.yml` that will compile the Dockerfile, upload this to the Docker Registry & then use this for building.

Updated registry to the registry server, as opposed to my username ... f19444201d

Oops.

Dockerfile corrections ... 9473e26b50

- /code already exists, don't create it in Dockerfile

.drone.yml modifications ... 6a1b87e250

Modified drone.yml to copy source from the /drone/src directory to the /code directory.

Still not working ... 43464bb550

Testing whether mount paths are the problem

Attempts to resolve issues with missing /code directory ... 8c51bd8690

Dockerfile expects `/code` attempting to resolve this in the .drone.yml

Further updates to .drone.yml ... 96fcf19c14

Still experiencing issues with not being able to find the .sh files due to missing /code directory.

DroneCI doesn't fetch tags by default ... d4236f455e

- Added `git fetch --tags` as the first command
- Changes to compile_vergen.sh in order to debug.

Cleaning up compile scripts ... f0dc598f44

- Debugging removed from `compile_vergen.sh`
- `compile.sh` modified to use a for loop for each command & only continue if previous steps succeeded.

Intentional edit to cause build failure ... 0b5981242b

- Intentional edit to `compile_stub.sh` in order to cause a build failure.

Testing Succeeded - Refinement & removal of debugging code ... 04cff2e2c3

- Removed the debug `exit 1` from `compile_stub.sh`
- Improved `compile.sh` to use runOrFail in a more suitable way, correctly passing through failure messages.

Testing artefact upload ... 738307d070

- Testing the upload of the resulting `Asuro.iso` to Gitea fromt the Drone pipeline.

Further tweaks to artefact upload step ... f795ba24f8

DroneCI wasn't happy with the mv of `Asuro.iso` - changed to a cp.

Further permission issues ... 315050f095

- Further attempts to fix permission issues within Drone when exporting the Asuro.iso artefact
- Switched to `alpine/git` instead of `curl` image, as git didn't exist under the `curl` image.

Debugging & Testing ... 5e6e6c394a

- Mistakes made in the curl methods used & the curl upload-file flag - rectified.

Exports don't persist between commands ... 2906b8724b

- Exports don't persist between commands in Drone commands - removed these exports and made more verbose commands.

Another attempt - issues with YAML layout for some reason d1a4b4d42f

Still experiencing YAML errors, for some reason. 0913daebc6

Slowly making progress ... f1211f3cca

- YAML is now valid - however, the attempt to temp store the revision number failed. Doing it inline instead.

Final Test before finalizing ... 6bca42f2a5

- Single quotes were causing the first CURL to fail.
- This should be the penultimate commit before ready to progress through dev to master.

Final commit to merge through develop & master ... b47194ed99

- CI/CD Pipeline now working & tested.
- Commits to all branches will trigger the pipeline in DroneCI.
- Commits to master will trigger the resulting ISO artefact to be uploaded to Gitea as a Package.

Merge pull request 'feature/ci-cd-drone-migration' (#3) from feature/ci-cd-drone-migration into develop ... 8c3649f691

Reviewed-on: #3

t3hn3rd closed this pull request 2025-03-10 12:44:55 +00:00

t3hn3rd commented 2025-03-10 12:45:14 +00:00

Author

Owner

Copy Link

Manually merged.

Manually merged.

Some checks failed

Hide all checks

continuous-integration/drone/push Build is passing

Details

continuous-integration/drone/pr Build is failing

Details

Pull request closed

Please reopen this pull request to perform a merge.

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

No items

No Label

Milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

Aaron admin t3hn3rd

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: Spexeah/Asuro#4

No description provided.