Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
jedeoric committed Oct 17, 2024
1 parent 384f1f1 commit b594b22
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 22 deletions.
33 changes: 15 additions & 18 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: build

# Controls when the action will run.
# Controls when the action will run.
on:
# Triggers the workflow on push event only for all branches
push:
branches: [ main, master, develop ]
# branches: [ main, master ]
#pull_request:
# branches: [ main, master ]

Expand All @@ -19,32 +19,32 @@ jobs:
steps:
- name: Cache sdk
id: cache-sdk
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
cc65/**/*
orix-sdk/**/*
md2hlp/**/*
orix-software/**/*
key: ${{ secrets.CACHE_ID }}-orix-sdk_
key: ${{ runner.os }}-orix-sdk

- name: Checkout cc65
if: steps.cache-sdk.outputs.cache-hit != 'true'
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: cc65/cc65
path: cc65

- name: Checkout orix-sdk
if: steps.cache-sdk.outputs.cache-hit != 'true'
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: assinie/orix-sdk
path: orix-sdk

- name: Checkout md2hlp
if: steps.cache-sdk.outputs.cache-hit != 'true'
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: assinie/md2hlp
path: md2hlp
Expand Down Expand Up @@ -89,37 +89,35 @@ jobs:
repo_name: ${{ steps.job_vars.outputs.REPO_NAME }}

steps:
- uses: actions/checkout@v2
with:
submodules: recursive
- uses: actions/checkout@v3

- name: Set job variables
id: job_vars
run: |
echo "::set-output name=VERSION::$(cat VERSION)"
echo "::set-output name=REPO_NAME::${GITHUB_REPOSITORY##*/}"
echo "VERSION=$(cat VERSION)" >> $GITHUB_OUTPUT
echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_OUTPUT
- name: Install sdk
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
cc65/**/*
orix-sdk/**/*
md2hlp/**/*
orix-software/**/*
key: ${{ secrets.CACHE_ID }}-orix-sdk_
key: ${{ runner.os }}-orix-sdk

- name: Prepare environment for project
run: mv cc65 ../ && mv orix-software ../ && mv orix-sdk ../ && mv md2hlp ../

- name: Compile project
run: CC65_HOME=${GITHUB_WORKSPACE}/../cc65 make
run: CC65_HOME=${GITHUB_WORKSPACE}/../cc65 ./make.sh

- name: List build directory content
run: ls -lR build

- name: Upload Artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: ${{ steps.job_vars.outputs.REPO_NAME }}
path: |
Expand Down Expand Up @@ -157,7 +155,7 @@ jobs:
# On pourrait faire l'extraction directement à la racine si VERSION est dans l'artifact
- name: Download Artifact
id: download
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: ${{ needs.build.outputs.repo_name }}
path: artifact
Expand All @@ -170,4 +168,3 @@ jobs:
run: |
if [ "$BRANCH_NAME" = "master" -o "$BRANCH_NAME" = "main" ]; then VERSION="$version"; else VERSION=alpha ; fi
curl -X POST --data-binary "@${ARCHIVE_NAME}" "https://cdn.oric.org/publish.php?hash=$hash&path=/home/oricoujr/www/ftp/orix/dists/$VERSION/tgz/6502/${ARCHIVE_NAME}"
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2024.1
2024.4
18 changes: 18 additions & 0 deletions bpm.tml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
[package]
name = "file"
version = "2024.4"
authors = [ "[email protected]",]
license = "MIT OR Apache-2.0"
edition = "2018"
cpu = "6502"
readme = ""
repository = ""
documentation = ""
description = ""
homepage = ""
buildfolder = "build"
packagetype = "tgz"
codetype = "bin"
oricutron_replace_autoboot_run = "False"

[dependencies]
5 changes: 3 additions & 2 deletions docs/md2hlp.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
;
; Default options
;
Version = 2
Version = 3
Break on hyphens = True

Head = ^A
Expand Down Expand Up @@ -30,6 +30,7 @@ cite = _|,


link = ^T,^P
image = None

ink_black = ^@
ink_red = ^A
Expand Down Expand Up @@ -64,7 +65,7 @@ paper_white = ^W
;
; Default for Heading 1
;
Head = __^J ^Q_Shell 2022.2 ^P___
Head = __^J ^Q_ORIX 1.0 ^P___

[Heading3]
;
Expand Down
Binary file added src/file
Binary file not shown.
2 changes: 1 addition & 1 deletion src/version.h
Original file line number Diff line number Diff line change
@@ -1 +1 @@
#define VERSION "2024.1"
#define VERSION "2024.4"

0 comments on commit b594b22

Please sign in to comment.