From b594b22fcb2d8f0aa62faa32258aba8d9e8a8c66 Mon Sep 17 00:00:00 2001 From: jede Date: Fri, 18 Oct 2024 00:09:07 +0200 Subject: [PATCH 01/90] fix --- .github/workflows/main.yml | 33 +++++++++++++++------------------ VERSION | 2 +- bpm.tml | 18 ++++++++++++++++++ docs/md2hlp.cfg | 5 +++-- src/file | Bin 0 -> 6892 bytes src/version.h | 2 +- 6 files changed, 38 insertions(+), 22 deletions(-) create mode 100644 bpm.tml create mode 100644 src/file diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d4fdf2d..d3cc276 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 ] @@ -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 @@ -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: | @@ -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 @@ -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}" - diff --git a/VERSION b/VERSION index 2cf03e5..53bb8b1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2024.1 \ No newline at end of file +2024.4 \ No newline at end of file diff --git a/bpm.tml b/bpm.tml new file mode 100644 index 0000000..746a905 --- /dev/null +++ b/bpm.tml @@ -0,0 +1,18 @@ +[package] +name = "file" +version = "2024.4" +authors = [ "nobody@nobody.fr",] +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] diff --git a/docs/md2hlp.cfg b/docs/md2hlp.cfg index b382254..7582dac 100644 --- a/docs/md2hlp.cfg +++ b/docs/md2hlp.cfg @@ -2,7 +2,7 @@ ; ; Default options ; -Version = 2 +Version = 3 Break on hyphens = True Head = ^A @@ -30,6 +30,7 @@ cite = _|, link = ^T,^P +image = None ink_black = ^@ ink_red = ^A @@ -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] ; diff --git a/src/file b/src/file new file mode 100644 index 0000000000000000000000000000000000000000..b998f8d29a2176ea43bdfb67e758a521fdad5c46 GIT binary patch literal 6892 zcmb_BYfxL)nO8#MAs`kQj6{k#U}IZHkRjNyiM!jW?brjIo7590*=)8my)uZP1P~U& zuXc8`yB0$zQc$;74VO?|Hu0xw18s)8)`m>SO#3ri`P$evJMbqs-0dbO{`^AqRi7teb-gm83i|s!z_gwONbT3 zqwJrPl0o$ag)E_v1t@g9JfJ}rO6h3cB}z=Af0f5;gfx0O4_5GDbAlH2MD(>hcE9YH zG~iHGz&1$c70DMsgfI`+r)`ewM;@ zSXC8QRE@4s#d_6>7*ilx7a5$2t;Mq#~dfGY)zW8MLvm`48=uq*|JeL)r^ zN5%`;kCJX@TaxC1oU!GDml-T{e z5JZh)UJ<1$WJ7ALN;Lvlsb*HRh*`xUQq9P?<<^o=a8jYjI9_%28a1YBfO%SV@8$C4 z%1{kdPBUD{Zca(4zo^ElJ?lJCE-Rf;acc2P%|OOAs*zpekh@jf8V5O{9%Qux=${v| z<`hS-0vUELiDtK@tiMRs7IX*Fq2)TGHZbT~Ngx9{#U)D6@`?{SHU#vfdGwY-Ll`AZ zgbjkUe=V1YNbW|E&|E9l#@5xfem znl#>JPXXiGMXW&%261$XSEcSxRD(qJY*0>Xwi5hJHc6DS2*bBFN>>2n?^#Tb6iHqA z`zC$^i2h3vUkcM66Tb1g^AXgf%hEd%jAN6RD`x0X@j!4 zLEf~OfCl zYcflh3B8|`Q!j6xQ;a!~0)jCF6w~NQ)tFCIWB$j4{wpb@PUgCy2q7|oYfA73270f-YDiJi)tQ)(GjmO(+V!m=N=0oLIzLh4h}Rw6JiCKP+BnGtfVl zglV=kK=t^e{Rw{*(qXjh(vpzDFM)$y{Tg$P+mEG#}b;Zy{h$0N42vvOyn*W^3al*{&5LerjuoF35=dI zT_fmoGn`;L+#Q<+si(M8@z`wb)#|=V-Voh};^sP{FP+;WeeIlw>#@f@63|SbzF*G8 zqn}DP4K3n@MSS``X5co!rq)FaPNIv;Ly18iCNyPUxP^s>3nCWoGGK4SU>(l3LXJmr zti!ov0d}9_&|)b%R2<^y3X}pgp}K%RK24qe1MW6HX!cBZ&7l7%^~`o%AXB1?XQ>bU zi3EIN3GZDC8Shy_vmP#V!2`~V&5GH4g_w~L7UwPqxBE@@S7K9g35IBf}UOM*UHA$AZq9!$NjYKmG^&?lgHv<|~A(*en^r zVdxVx{rh5;3TA(B4PP|=2@q9+-gga)W(dFDcO8pH9>L-U7Biq|vwSx(u+hwuLBv-J z>0tn3v%Uq)V_65JkXxZP4nwhtW;*z({rW&^;`s_ueOw4;YZIn11vPzD+13$;EXM$0z(81jEmP zPk5)W71)MuVzH>MYf3+*KcgSXy^VA4fDE=8)fYDhG8Gx^LT-@q-Np0Z9rn1emG2O8 zh-n5Zm`ap%3fbr@Gw6I@(s>*VeO0j3ML@VglEuCX0ttx`NSgWMLY9(nTsiQAISLpo z_vToAxz>nmNa65pd?Uvixr0BvnQM)v`*N(kxz^gqEqpV_8jgsV?543)xPHki;vN`p z;m9>Cq@g#9(a~a9iew4$y-!$K%Dc`AuWzORbtIbbO!XXzhE1WUL+gn`^2I_^Orp-z zZ;#4gGZR?4^j1_0Wq9V)2oqVf4BscO^^pgb;fK=uy^hvwpmsx@iW%^pX`vrk7`SE% zzY`vR$8yy6||tB}g%~U?UTXk~R?S(=f9!3DBhi=_(+_N)zKO8X-&SO6*dY zVM)t@juxcoDEXy=O3XYZWP`#CR!=$?L+>^ZO!peC12esOR#K9rlUOujI*d9|mK3IS zrD1?G#S9o9_^0Q6`Bo4+jZEZnt0{*I9|q}~`(_y^$OQ#ih%H4krNBCrZxt)+fF9bb z$)WK_6QtWZDCm{i*fi;i&9zrGQO!l*)WMIIB1D%%12sYe&6#I)0Zrbtf4WE9Xll*3 zLOTMgOpvc*wZhkMB>57*Up{2Co|+!Yv!0rvhfBTdtsc%-V1@KmU1F3P^>8V8NGIHu zokG}G*$=Xx038NNaKJ$SO9>j-1ooJ~o`MJw94W9uLju8BIzK0bQj7rACWn?>EP#$e zLypcxMLm4en7Qa&j0xyKTp*ncnPkwAsKq!SrY z9ZQLZ4>scYOWDG8mV(v7q9vdu=)arik$9gk7t=1X$on(gV{-KMr7e7oPM^fA{`3!U zA_26Lp!rXKhJ{67e@72B#vA%3*^@!+ePHoDv@k+?km_NCKamc|h>xlt5Kz<_Z%Omj zzCTLy?_tD@XQD@Zs%sMb)ISgxw|b@m#sia06MfkxI~NYc?NdQxg!!-ZIYw;SXdE#>EoPG#khXSTrVtdvo!*F<~K^7F=S28gO&h zWRQZYn-DV-!lSv#dEs8aq>HeUY7`65CnXjwG#<`@;KC7Z%*BQI(CFY8Bu{PqlGJ`l zRY3o3rvJGlND-MNzxA7>cNdoOj0B8>lVT}JPrPL$JTnm*xiZ<8=^5#{G7+BRdb)+L zJ!cpR9o5ZDK<-YE++Bc8sP>w2c<+*0S>z{p_+5>E3;!Lf57?wS) ze(d#QDEB(JA7IOmp_fIyKf!FD)Ze`CVitpE(1*p5K0NG)M1yLa?-~owca17VIVJrA z&6k^ajaU-mJe8rirz&)QV0>_j`X+HUN1Po8XU~oby4f-D8^lfFO9mm6GP1dpF$mu| zPPjZ5r@!1JRT+EM!?D;ChZm_JR2lK&pXcHih5J)BQBR-;3~I4Axlx0?&24v8NEuR(_$?hXSbThQckwz*Z63UJug@TOvtw3O{J zP%pQ=+2%afhV~tN8M#li+YL{B*X1~ljyc=5x>1MQ=5ix0tOgpyyJO<gW%vs*c)S9S&z3$WvV2fs`!+ zb%?k@wrg!M2b``}n_Fc-H6X=hZ*ev(drj8U40@XFE$yjF2n=4`3nw^ecO9}f01~x! zcDNznsKMFV-s!dj{(#GVq|@Hka01XPun2O7UUuBt20m|V2X{1e*xkUt!ucfMUV_N) z1%vCK1AIk;{AZvDTL($SRZK`e@)|ruoQzx{Ovyeu@xTzdPQdsVI$IAz=pbBj^oR+a z;Ptf??}bDsp0c&JL+nWSlkOwtC|gn%OKw*)SCLoIDW{8p+SA$SaH1wTcDun4MEGBm z)e;MkM4<$CH?_}3YQouWZ$lN3Vru2c0w_t>fqHuX3wxg5546afHP3^YrA$SG|Sx398_zmf7tVif?iHu>P6cz zW$&du2UX?{=tfW|P-S)X%AR74fs%|Shw1FFy>8zPX16-q2<^^i_SHVU(?Hc!*X(%e zX#!T)0QTU%=K(2aF>I1O&N&tP{qnWQI+lArD5f#t!MU#=)uA1y_F`?==|^3+E|wJYQl z#VoHLTd1tctW{Z+Swq2}hSDbgr$^!b%<>z{?<}+oc{8vt6MLV)zIC`ezO>{u$x{*T zEyieRDX=8WGmokLe+D+ Date: Mon, 21 Oct 2024 00:23:44 +0200 Subject: [PATCH 02/90] test --- .github/workflows/main.yml | 40 +++++++++++-- .gitignore | 4 +- docs/md2hlp.cfg | 111 +++++++++---------------------------- 3 files changed, 65 insertions(+), 90 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d3cc276..fe0d6d8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -68,6 +68,20 @@ jobs: echo "src/include" >> .git/info/sparse-checkout git checkout + - name: Prepare environment for oricutron + if: steps.cache-sdk.outputs.cache-hit != 'true' + run: | + sudo apt-get install -y xvfb libgtk-3-0 libgtk-3-dev libsdl1.2debian libsdl1.2-dev + git clone https://github.com/pete-gordon/oricutron.git + cd oricutron && make && pwd && cd .. && ls -l && echo ${GITHUB_WORKSPACE} + echo Timeout oricutron : $secret.TMOUT_ORICUTRON + + - name:Get bpm + if: steps.cache-sdk.outputs.cache-hit != 'true' + run: | + wget https://raw.githubusercontent.com/orix-software/bpm/refs/heads/main/src/bpm -o ~/bin/bpm && chmod 755 ~/bin/bpm + bpm -V + - name: Compile orix-sdk if: steps.cache-sdk.outputs.cache-hit != 'true' working-directory: orix-sdk @@ -111,7 +125,24 @@ jobs: run: mv cc65 ../ && mv orix-software ../ && mv orix-sdk ../ && mv md2hlp ../ - name: Compile project - run: CC65_HOME=${GITHUB_WORKSPACE}/../cc65 ./make.sh + run: CC65_HOME=${GITHUB_WORKSPACE}/../cc65 bpm build + + - name: Unit-test with oricutron + run: | + git clone https://github.com/orix-software/docker-unit-test.git + cd docker-unit-test && bash install.sh ${GITHUB_WORKSPACE} && cd .. + if [ -d "tests/build/" ] && [ "$(ls -A tests/build/" ]; then + cp tests/build/* > ${GITHUB_WORKSPACE}/oricutron/sdcard/BIN + echo "#!/bin/submit\n" > ${GITHUB_WORKSPACE}/oricutron/sdcard/ETC/AUTOBOOT + cp tests/run.sub >> ${GITHUB_WORKSPACE}/oricutron/sdcard/ETC/AUTOBOOT + cd ${GITHUB_WORKSPACE}/oricutron + timeout --preserve-status 10 ./xvfb.sh || exit 0 + fi + + - name: Check unit-test + run: | + ls -l ${GITHUB_WORKSPACE}/oricutron/sdcard/ + bash tests/unit-tests/verify.sh ${GITHUB_WORKSPACE}/oricutron/sdcard/ - name: List build directory content run: ls -lR build @@ -162,9 +193,10 @@ jobs: - name: Make archive working-directory: ${{steps.download.outputs.download-path}} - run: tar -zcvf $GITHUB_WORKSPACE/$ARCHIVE_NAME * + run: bpm package - name: Upload to oric 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}" + ecport BPM_PUBLISH_KEY = $hash + if [ "$BRANCH_NAME" = "master" -o "$BRANCH_NAME" = "main" ]; then VERSION="$version"; bpm publish --official ; else VERSION=alpha; bpm publish --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}" diff --git a/.gitignore b/.gitignore index 95d5715..839f4be 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ data/ -build/ \ No newline at end of file +build/ +bpmtmp/ +package/ \ No newline at end of file diff --git a/docs/md2hlp.cfg b/docs/md2hlp.cfg index 7582dac..6fc283d 100644 --- a/docs/md2hlp.cfg +++ b/docs/md2hlp.cfg @@ -1,37 +1,20 @@ [DEFAULT] -; -; Default options -; -Version = 3 -Break on hyphens = True - -Head = ^A -Paragraph = -Initial Indent = _ -Subsequent Indent = _ -Align = -List = - +version = 2 +break on hyphens = True +head = ^A +paragraph = +initial indent = _ +subsequent indent = _ +align = +list = quote block = _^@^W - -#bold = ^@^W,^G^P bold = ^T, ^P - italic = ^C,^G underline = ^F,^G strike_through = ^E,^G - -#quote = ^@^V,^G^P quote = ^v,^v - -# Orix n'a pas le jeu de caracteres graphiques -#cite = ^IJ^H, cite = _|, - - link = ^T,^P -image = None - ink_black = ^@ ink_red = ^A ink_green = ^B @@ -40,13 +23,11 @@ ink_blue = ^D ink_purple = ^E ink_cyan = ^F ink_white = ^G - simple_height = ^H simple_graph = ^I double_height = ^J blink_simple = ^L blink_double = ^N - paper_black = ^P paper_red = ^Q paper_green = ^R @@ -56,77 +37,37 @@ paper_purple = ^U paper_cyan = ^V paper_white = ^W - -; ============================================================================== - - - [Heading1] -; -; Default for Heading 1 -; -Head = __^J ^Q_ORIX 1.0 ^P___ +head = __^J ^Q_file 2024.4 ^P___ + [Heading3] -; -; Default for Heading 3 -; -Head = ^L^C -Align = ^ - - - -; ============================================================================== - - +head = ^L^C +align = ^ [SYNOPSYS] -; -; Defaults for SYNOPSYS section -; -Initial Indent = ________ -Paragraph = ^B -List = ^B - - +initial indent = ________ +paragraph = ^B +list = ^B [DESCRIPTION] -; -; Defaults for DESCRIPTION section -; -Initial Indent = ______ -Subsequent Indent = __ +initial indent = ______ +subsequent indent = __ [OPTIONS] -; Defaults for OPTIONS section -; -Initial Indent = __^B -Subsequent Indent = __^B -List = ^A - +initial indent = __^B +subsequent indent = __^B +list = ^A [EXAMPLES] -; -; Defaults for EXAMPLES section -; -Initial Indent = ________ -Paragraph = ^B -List = ^B - - +initial indent = ________ +paragraph = ^B +list = ^B [NOTES] -; -; Defaults for NOTES section -; - - [SOURCE] -; -; Defaults for SOURCE section -; -Break on hyphens = False -Initial Indent = '^F ' -Subsequent Indent = '^F' +break on hyphens = False +initial indent = '^F ' +subsequent indent = '^F' From 781a63dc6ea98a3299754c607fe139e87bbf79e7 Mon Sep 17 00:00:00 2001 From: jede Date: Mon, 21 Oct 2024 00:34:28 +0200 Subject: [PATCH 03/90] fix --- .github/workflows/main.yml | 39 +++++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fe0d6d8..01d31ea 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,6 +26,7 @@ jobs: orix-sdk/**/* md2hlp/**/* orix-software/**/* + bpm/**/* key: ${{ runner.os }}-orix-sdk - name: Checkout cc65 @@ -35,6 +36,13 @@ jobs: repository: cc65/cc65 path: cc65 + - name: Checkout bpm + if: steps.cache-sdk.outputs.cache-hit != 'true' + uses: actions/checkout@v3 + with: + repository: orix-software/bpm + path: bpm + - name: Checkout orix-sdk if: steps.cache-sdk.outputs.cache-hit != 'true' uses: actions/checkout@v3 @@ -68,6 +76,12 @@ jobs: echo "src/include" >> .git/info/sparse-checkout git checkout + - name:Get bpm + if: steps.cache-sdk.outputs.cache-hit != 'true' + run: | + wget https://raw.githubusercontent.com/orix-software/bpm/refs/heads/main/src/bpm -o ~/bin/bpm && chmod 755 ~/bin/bpm + bpm -V + - name: Prepare environment for oricutron if: steps.cache-sdk.outputs.cache-hit != 'true' run: | @@ -76,12 +90,6 @@ jobs: cd oricutron && make && pwd && cd .. && ls -l && echo ${GITHUB_WORKSPACE} echo Timeout oricutron : $secret.TMOUT_ORICUTRON - - name:Get bpm - if: steps.cache-sdk.outputs.cache-hit != 'true' - run: | - wget https://raw.githubusercontent.com/orix-software/bpm/refs/heads/main/src/bpm -o ~/bin/bpm && chmod 755 ~/bin/bpm - bpm -V - - name: Compile orix-sdk if: steps.cache-sdk.outputs.cache-hit != 'true' working-directory: orix-sdk @@ -122,7 +130,7 @@ jobs: key: ${{ runner.os }}-orix-sdk - name: Prepare environment for project - run: mv cc65 ../ && mv orix-software ../ && mv orix-sdk ../ && mv md2hlp ../ + run: mv cc65 ../ && mv orix-software ../ && mv orix-sdk ../ && mv md2hlp ../ && mkdir ~/bin && cp bpm/src/bpm ~/bin && chmod 755 ~/bin/bpm && echo $PATH - name: Compile project run: CC65_HOME=${GITHUB_WORKSPACE}/../cc65 bpm build @@ -193,10 +201,19 @@ jobs: - name: Make archive working-directory: ${{steps.download.outputs.download-path}} - run: bpm package + run: | + if [ -f "bpm.tml" ]; then + bpm package + else + tar -zcvf $GITHUB_WORKSPACE/$ARCHIVE_NAME * + fi - name: Upload to oric run: | - ecport BPM_PUBLISH_KEY = $hash - if [ "$BRANCH_NAME" = "master" -o "$BRANCH_NAME" = "main" ]; then VERSION="$version"; bpm publish --official ; else VERSION=alpha; bpm publish --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}" + export BPM_PUBLISH_KEY = $hash + if [ -f "bpm.tml" ]; then + if [ "$BRANCH_NAME" = "master" -o "$BRANCH_NAME" = "main" ]; then bpm publish --official; else bpm publish --alpha; fi + else + if [ "$BRANCH_NAME" = "master" -o "$BRANCH_NAME" = "main" ]; then VERSION="$version"; else VERSION=alpha; bpm publish --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}" + fi From a7d0a6551d0c9de0d6a6136eda40aa25e710c69f Mon Sep 17 00:00:00 2001 From: jede Date: Mon, 21 Oct 2024 00:42:41 +0200 Subject: [PATCH 04/90] fix space --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 01d31ea..607f2d2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -210,6 +210,7 @@ jobs: - name: Upload to oric run: | + export BPM_PUBLISH_KEY = $hash if [ -f "bpm.tml" ]; then if [ "$BRANCH_NAME" = "master" -o "$BRANCH_NAME" = "main" ]; then bpm publish --official; else bpm publish --alpha; fi From e7548d2cd3df65b79cb528b5e3e67cfe9282eb47 Mon Sep 17 00:00:00 2001 From: jede Date: Mon, 21 Oct 2024 00:44:21 +0200 Subject: [PATCH 05/90] test --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 607f2d2..9705152 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -76,7 +76,7 @@ jobs: echo "src/include" >> .git/info/sparse-checkout git checkout - - name:Get bpm + - name: Get bpm if: steps.cache-sdk.outputs.cache-hit != 'true' run: | wget https://raw.githubusercontent.com/orix-software/bpm/refs/heads/main/src/bpm -o ~/bin/bpm && chmod 755 ~/bin/bpm From 66f3fcc28c7e663cb7e78fd1c29b512f8f8fb6d0 Mon Sep 17 00:00:00 2001 From: jede Date: Mon, 21 Oct 2024 01:07:12 +0200 Subject: [PATCH 06/90] Fix ci --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9705152..0647b9b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -79,7 +79,7 @@ jobs: - name: Get bpm if: steps.cache-sdk.outputs.cache-hit != 'true' run: | - wget https://raw.githubusercontent.com/orix-software/bpm/refs/heads/main/src/bpm -o ~/bin/bpm && chmod 755 ~/bin/bpm + mkdir ~/bin/ && wget https://raw.githubusercontent.com/orix-software/bpm/refs/heads/main/src/bpm -o ~/bin/bpm && chmod 755 ~/bin/bpm bpm -V - name: Prepare environment for oricutron From 1fd2dd7e535a2e3e160f1300f2f2e4a33fbc37aa Mon Sep 17 00:00:00 2001 From: jede Date: Mon, 21 Oct 2024 01:09:33 +0200 Subject: [PATCH 07/90] fix --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0647b9b..1d8a1ca 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -79,7 +79,7 @@ jobs: - name: Get bpm if: steps.cache-sdk.outputs.cache-hit != 'true' run: | - mkdir ~/bin/ && wget https://raw.githubusercontent.com/orix-software/bpm/refs/heads/main/src/bpm -o ~/bin/bpm && chmod 755 ~/bin/bpm + mkdir ~/bin/ && wget https://raw.githubusercontent.com/orix-software/bpm/refs/heads/main/src/bpm -o ~/bin/bpm && chmod 755 ~/bin/bpm && export PATH=$PATH:~/bin/bpm bpm -V - name: Prepare environment for oricutron From a39d14a1f0fdafdbb20f7e833f1878648803a6fe Mon Sep 17 00:00:00 2001 From: jede Date: Mon, 21 Oct 2024 01:24:16 +0200 Subject: [PATCH 08/90] fix --- .github/workflows/main.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1d8a1ca..dc94c69 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -76,12 +76,6 @@ jobs: echo "src/include" >> .git/info/sparse-checkout git checkout - - name: Get bpm - if: steps.cache-sdk.outputs.cache-hit != 'true' - run: | - mkdir ~/bin/ && wget https://raw.githubusercontent.com/orix-software/bpm/refs/heads/main/src/bpm -o ~/bin/bpm && chmod 755 ~/bin/bpm && export PATH=$PATH:~/bin/bpm - bpm -V - - name: Prepare environment for oricutron if: steps.cache-sdk.outputs.cache-hit != 'true' run: | @@ -130,10 +124,15 @@ jobs: key: ${{ runner.os }}-orix-sdk - name: Prepare environment for project - run: mv cc65 ../ && mv orix-software ../ && mv orix-sdk ../ && mv md2hlp ../ && mkdir ~/bin && cp bpm/src/bpm ~/bin && chmod 755 ~/bin/bpm && echo $PATH + run: mv cc65 ../ && mv orix-software ../ && mv orix-sdk ../ && mv md2hlp ../ && mkdir ~/bin && cp bpm/src/bpm ~/bin && chmod 755 ~/bin/bpm && echo $PATH && export PATH=$PATH:~/bin/bpm && ls -l ~/bin/ - name: Compile project - run: CC65_HOME=${GITHUB_WORKSPACE}/../cc65 bpm build + run: | + if [ -f "bpm.tml" ]; then + CC65_HOME=${GITHUB_WORKSPACE}/../cc65 bpm build + else + CC65_HOME=${GITHUB_WORKSPACE}/../cc65 make + fi - name: Unit-test with oricutron run: | @@ -210,7 +209,6 @@ jobs: - name: Upload to oric run: | - export BPM_PUBLISH_KEY = $hash if [ -f "bpm.tml" ]; then if [ "$BRANCH_NAME" = "master" -o "$BRANCH_NAME" = "main" ]; then bpm publish --official; else bpm publish --alpha; fi From 453db1be2a40d0fcb5547b609f0ec933ca395b27 Mon Sep 17 00:00:00 2001 From: jede Date: Mon, 21 Oct 2024 01:27:04 +0200 Subject: [PATCH 09/90] fix --- .github/workflows/main.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dc94c69..b2d1eda 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -76,6 +76,12 @@ jobs: echo "src/include" >> .git/info/sparse-checkout git checkout + - name: Get bpm + if: steps.cache-sdk.outputs.cache-hit != 'true' + run: | + mkdir ~/bin/ && wget https://raw.githubusercontent.com/orix-software/bpm/refs/heads/main/src/bpm -o ~/bin/bpm && chmod 755 ~/bin/bpm && export PATH=$PATH:~/bin/bpm && ls -l ~/bin/bpm + bpm -V + - name: Prepare environment for oricutron if: steps.cache-sdk.outputs.cache-hit != 'true' run: | @@ -124,7 +130,7 @@ jobs: key: ${{ runner.os }}-orix-sdk - name: Prepare environment for project - run: mv cc65 ../ && mv orix-software ../ && mv orix-sdk ../ && mv md2hlp ../ && mkdir ~/bin && cp bpm/src/bpm ~/bin && chmod 755 ~/bin/bpm && echo $PATH && export PATH=$PATH:~/bin/bpm && ls -l ~/bin/ + run: mv cc65 ../ && mv orix-software ../ && mv orix-sdk ../ && mv md2hlp ../ && mkdir ~/bin && cp bpm/src/bpm ~/bin && chmod 755 ~/bin/bpm && echo $PATH - name: Compile project run: | From a752b44bd99e60608a8040fbac7feb57dc44b563 Mon Sep 17 00:00:00 2001 From: jede Date: Tue, 22 Oct 2024 22:08:24 +0200 Subject: [PATCH 10/90] test --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b2d1eda..5a1ef0e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -130,7 +130,7 @@ jobs: key: ${{ runner.os }}-orix-sdk - name: Prepare environment for project - run: mv cc65 ../ && mv orix-software ../ && mv orix-sdk ../ && mv md2hlp ../ && mkdir ~/bin && cp bpm/src/bpm ~/bin && chmod 755 ~/bin/bpm && echo $PATH + run: mv cc65 ../ && mv orix-software ../ && mv orix-sdk ../ && mv md2hlp ../ && mkdir ~/bin && ls -l && cp bpm/src/bpm ~/bin && chmod 755 ~/bin/bpm && echo $PATH - name: Compile project run: | From ea35d6c670f3f7078f10502a32a1b718cb937188 Mon Sep 17 00:00:00 2001 From: jede Date: Tue, 22 Oct 2024 22:11:20 +0200 Subject: [PATCH 11/90] test2 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5a1ef0e..f33d988 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -130,7 +130,7 @@ jobs: key: ${{ runner.os }}-orix-sdk - name: Prepare environment for project - run: mv cc65 ../ && mv orix-software ../ && mv orix-sdk ../ && mv md2hlp ../ && mkdir ~/bin && ls -l && cp bpm/src/bpm ~/bin && chmod 755 ~/bin/bpm && echo $PATH + run: ls -l && ls -l .. && ls -l ~/bin/bpm && mv cc65 ../ && mv orix-software ../ && mv orix-sdk ../ && mv md2hlp ../ && mkdir ~/bin && ls -l && cp bpm/src/bpm ~/bin && chmod 755 ~/bin/bpm && echo $PATH - name: Compile project run: | From b514144f661e365030f5afb8ec9115b6050c977f Mon Sep 17 00:00:00 2001 From: jede Date: Tue, 22 Oct 2024 22:14:18 +0200 Subject: [PATCH 12/90] test3 --- .github/workflows/main.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f33d988..14a0e62 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -79,7 +79,7 @@ jobs: - name: Get bpm if: steps.cache-sdk.outputs.cache-hit != 'true' run: | - mkdir ~/bin/ && wget https://raw.githubusercontent.com/orix-software/bpm/refs/heads/main/src/bpm -o ~/bin/bpm && chmod 755 ~/bin/bpm && export PATH=$PATH:~/bin/bpm && ls -l ~/bin/bpm + mkdir ~/bin/ && wget https://raw.githubusercontent.com/orix-software/bpm/refs/heads/main/src/bpm -o ~/bin/bpm && chmod 755 ~/bin/bpm && export PATH=$PATH:~/bin/bpm && ls -l ~/bin/bpm bpm -V - name: Prepare environment for oricutron @@ -130,7 +130,10 @@ jobs: key: ${{ runner.os }}-orix-sdk - name: Prepare environment for project - run: ls -l && ls -l .. && ls -l ~/bin/bpm && mv cc65 ../ && mv orix-software ../ && mv orix-sdk ../ && mv md2hlp ../ && mkdir ~/bin && ls -l && cp bpm/src/bpm ~/bin && chmod 755 ~/bin/bpm && echo $PATH + run: | + wget https://raw.githubusercontent.com/orix-software/bpm/refs/heads/main/src/bpm -o ~/bin/bpm && chmod 755 ~/bin/bpm && export PATH=$PATH:~/bin/bpm && ls -l ~/bin/bpm + bpm -V + ls -l && ls -l .. && ls -l ~/bin/ && mv cc65 ../ && mv orix-software ../ && mv orix-sdk ../ && mv md2hlp ../ && mkdir ~/bin && chmod 755 ~/bin/bpm && echo $PATH - name: Compile project run: | From d8a685954c7aa387e1383541d8a47b002bdbde6e Mon Sep 17 00:00:00 2001 From: jede Date: Tue, 22 Oct 2024 22:16:07 +0200 Subject: [PATCH 13/90] test4 --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 14a0e62..e3b52bb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -131,6 +131,7 @@ jobs: - name: Prepare environment for project run: | + mkdir ~/bin -p wget https://raw.githubusercontent.com/orix-software/bpm/refs/heads/main/src/bpm -o ~/bin/bpm && chmod 755 ~/bin/bpm && export PATH=$PATH:~/bin/bpm && ls -l ~/bin/bpm bpm -V ls -l && ls -l .. && ls -l ~/bin/ && mv cc65 ../ && mv orix-software ../ && mv orix-sdk ../ && mv md2hlp ../ && mkdir ~/bin && chmod 755 ~/bin/bpm && echo $PATH From 46ee1834be3b8db08e088c1df123f269f962e47b Mon Sep 17 00:00:00 2001 From: jede Date: Tue, 22 Oct 2024 22:20:45 +0200 Subject: [PATCH 14/90] test --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e3b52bb..26862d1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -133,6 +133,9 @@ jobs: run: | mkdir ~/bin -p wget https://raw.githubusercontent.com/orix-software/bpm/refs/heads/main/src/bpm -o ~/bin/bpm && chmod 755 ~/bin/bpm && export PATH=$PATH:~/bin/bpm && ls -l ~/bin/bpm + echo $PATH + PATH=$PATH:~/bin + echo $PATH bpm -V ls -l && ls -l .. && ls -l ~/bin/ && mv cc65 ../ && mv orix-software ../ && mv orix-sdk ../ && mv md2hlp ../ && mkdir ~/bin && chmod 755 ~/bin/bpm && echo $PATH From 149809629de2c12f1bbbf10d64516d742fd818a1 Mon Sep 17 00:00:00 2001 From: jede Date: Tue, 22 Oct 2024 22:22:38 +0200 Subject: [PATCH 15/90] fix --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 26862d1..5aa33b5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -79,7 +79,7 @@ jobs: - name: Get bpm if: steps.cache-sdk.outputs.cache-hit != 'true' run: | - mkdir ~/bin/ && wget https://raw.githubusercontent.com/orix-software/bpm/refs/heads/main/src/bpm -o ~/bin/bpm && chmod 755 ~/bin/bpm && export PATH=$PATH:~/bin/bpm && ls -l ~/bin/bpm + mkdir ~/bin/ && wget https://raw.githubusercontent.com/orix-software/bpm/refs/heads/main/src/bpm -o ~/bin/bpm && chmod 755 ~/bin/bpm && export PATH=$PATH:~/bin && ls -l ~/bin/bpm bpm -V - name: Prepare environment for oricutron @@ -136,6 +136,7 @@ jobs: echo $PATH PATH=$PATH:~/bin echo $PATH + cat ~/bin/bpm bpm -V ls -l && ls -l .. && ls -l ~/bin/ && mv cc65 ../ && mv orix-software ../ && mv orix-sdk ../ && mv md2hlp ../ && mkdir ~/bin && chmod 755 ~/bin/bpm && echo $PATH From 5f8db2624a8e304ea08a79777d42731259902aa1 Mon Sep 17 00:00:00 2001 From: jede Date: Tue, 22 Oct 2024 22:26:19 +0200 Subject: [PATCH 16/90] fix --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5aa33b5..4d16f90 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -80,6 +80,7 @@ jobs: if: steps.cache-sdk.outputs.cache-hit != 'true' run: | mkdir ~/bin/ && wget https://raw.githubusercontent.com/orix-software/bpm/refs/heads/main/src/bpm -o ~/bin/bpm && chmod 755 ~/bin/bpm && export PATH=$PATH:~/bin && ls -l ~/bin/bpm + ls -l ~/bin bpm -V - name: Prepare environment for oricutron From 3aca43ebbc77c252a59b82c868f301a1bccc6f8a Mon Sep 17 00:00:00 2001 From: jede Date: Tue, 22 Oct 2024 22:28:04 +0200 Subject: [PATCH 17/90] fix --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4d16f90..326bca1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -76,7 +76,7 @@ jobs: echo "src/include" >> .git/info/sparse-checkout git checkout - - name: Get bpm + - name: Get bpm 2 if: steps.cache-sdk.outputs.cache-hit != 'true' run: | mkdir ~/bin/ && wget https://raw.githubusercontent.com/orix-software/bpm/refs/heads/main/src/bpm -o ~/bin/bpm && chmod 755 ~/bin/bpm && export PATH=$PATH:~/bin && ls -l ~/bin/bpm From ab2bd921e01b4ae974a6c8969740e57999a0f8b4 Mon Sep 17 00:00:00 2001 From: jede Date: Tue, 22 Oct 2024 22:34:08 +0200 Subject: [PATCH 18/90] fix --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 326bca1..de4683a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -77,7 +77,7 @@ jobs: git checkout - name: Get bpm 2 - if: steps.cache-sdk.outputs.cache-hit != 'true' + # if: steps.cache-sdk.outputs.cache-hit != 'true' run: | mkdir ~/bin/ && wget https://raw.githubusercontent.com/orix-software/bpm/refs/heads/main/src/bpm -o ~/bin/bpm && chmod 755 ~/bin/bpm && export PATH=$PATH:~/bin && ls -l ~/bin/bpm ls -l ~/bin From 89e6e0eb9e0239746a0cc146d7a3f17f4bd09bc9 Mon Sep 17 00:00:00 2001 From: jede Date: Tue, 22 Oct 2024 22:36:38 +0200 Subject: [PATCH 19/90] test --- .github/workflows/main.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index de4683a..47f07b4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -75,12 +75,15 @@ jobs: git config --local core.sparseCheckout true echo "src/include" >> .git/info/sparse-checkout git checkout - + - name: Get bpm 2 # if: steps.cache-sdk.outputs.cache-hit != 'true' run: | - mkdir ~/bin/ && wget https://raw.githubusercontent.com/orix-software/bpm/refs/heads/main/src/bpm -o ~/bin/bpm && chmod 755 ~/bin/bpm && export PATH=$PATH:~/bin && ls -l ~/bin/bpm - ls -l ~/bin + git clone https://raw.githubusercontent.com/orix-software/bpm + mkdir ~/bin + cp bpm/src/bpm ~/bin + chmod 755 ~/bin/bpm && export PATH=$PATH:~/bin && ls -l ~/bin/ + bpm -V - name: Prepare environment for oricutron From b9c59468a78a88885123a311f24e1a115c3e301f Mon Sep 17 00:00:00 2001 From: jede Date: Tue, 22 Oct 2024 22:38:05 +0200 Subject: [PATCH 20/90] fss --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 47f07b4..53f4bbf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -81,6 +81,8 @@ jobs: run: | git clone https://raw.githubusercontent.com/orix-software/bpm mkdir ~/bin + ls -l + ls -l ~/bin cp bpm/src/bpm ~/bin chmod 755 ~/bin/bpm && export PATH=$PATH:~/bin && ls -l ~/bin/ From 6e1f176b9d7ec5ff9e0872b356e49f989ad7be06 Mon Sep 17 00:00:00 2001 From: jede Date: Tue, 22 Oct 2024 22:40:55 +0200 Subject: [PATCH 21/90] fix --- .github/workflows/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 53f4bbf..28a3574 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -75,11 +75,10 @@ jobs: git config --local core.sparseCheckout true echo "src/include" >> .git/info/sparse-checkout git checkout - + - name: Get bpm 2 # if: steps.cache-sdk.outputs.cache-hit != 'true' run: | - git clone https://raw.githubusercontent.com/orix-software/bpm mkdir ~/bin ls -l ls -l ~/bin From a6ea7a4251a8b9ba2bc1141c16d6223cefb58479 Mon Sep 17 00:00:00 2001 From: jede Date: Tue, 22 Oct 2024 22:47:49 +0200 Subject: [PATCH 22/90] test --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 28a3574..f31b1c2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -82,6 +82,7 @@ jobs: mkdir ~/bin ls -l ls -l ~/bin + cd bpm && pip install -r requirements.txt && cd .. cp bpm/src/bpm ~/bin chmod 755 ~/bin/bpm && export PATH=$PATH:~/bin && ls -l ~/bin/ From 99eccbc749edcb6476c0cf27d312a9d61fc620fb Mon Sep 17 00:00:00 2001 From: jede Date: Tue, 22 Oct 2024 22:49:28 +0200 Subject: [PATCH 23/90] fix --- .github/workflows/main.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f31b1c2..08e4cc4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -76,16 +76,13 @@ jobs: echo "src/include" >> .git/info/sparse-checkout git checkout - - name: Get bpm 2 + - name: Settin bpm # if: steps.cache-sdk.outputs.cache-hit != 'true' run: | mkdir ~/bin - ls -l - ls -l ~/bin cd bpm && pip install -r requirements.txt && cd .. cp bpm/src/bpm ~/bin chmod 755 ~/bin/bpm && export PATH=$PATH:~/bin && ls -l ~/bin/ - bpm -V - name: Prepare environment for oricutron @@ -137,14 +134,8 @@ jobs: - name: Prepare environment for project run: | - mkdir ~/bin -p - wget https://raw.githubusercontent.com/orix-software/bpm/refs/heads/main/src/bpm -o ~/bin/bpm && chmod 755 ~/bin/bpm && export PATH=$PATH:~/bin/bpm && ls -l ~/bin/bpm - echo $PATH - PATH=$PATH:~/bin - echo $PATH - cat ~/bin/bpm bpm -V - ls -l && ls -l .. && ls -l ~/bin/ && mv cc65 ../ && mv orix-software ../ && mv orix-sdk ../ && mv md2hlp ../ && mkdir ~/bin && chmod 755 ~/bin/bpm && echo $PATH + ls -l && ls -l .. && ls -l ~/bin/ && mv cc65 ../ && mv orix-software ../ && mv orix-sdk ../ && mv md2hlp ../ - name: Compile project run: | From fcc89b6f1b073debe9586702252b0fe03406926d Mon Sep 17 00:00:00 2001 From: jede Date: Tue, 22 Oct 2024 22:50:54 +0200 Subject: [PATCH 24/90] fix --- .github/workflows/main.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 08e4cc4..1c22109 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -76,7 +76,7 @@ jobs: echo "src/include" >> .git/info/sparse-checkout git checkout - - name: Settin bpm + - name: Setting bpm # if: steps.cache-sdk.outputs.cache-hit != 'true' run: | mkdir ~/bin @@ -134,6 +134,9 @@ jobs: - name: Prepare environment for project run: | + echo $PATH + ls -l ~bin/ + ls -l bpm -V ls -l && ls -l .. && ls -l ~/bin/ && mv cc65 ../ && mv orix-software ../ && mv orix-sdk ../ && mv md2hlp ../ From 9969fe938c0c9812bc7e234db45e44ce42f67a37 Mon Sep 17 00:00:00 2001 From: jede Date: Tue, 22 Oct 2024 22:53:33 +0200 Subject: [PATCH 25/90] test --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1c22109..89405fd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -130,6 +130,7 @@ jobs: orix-sdk/**/* md2hlp/**/* orix-software/**/* + bpm/**/* key: ${{ runner.os }}-orix-sdk - name: Prepare environment for project From b32875af13c96251c48c42a451239ea9b5afacba Mon Sep 17 00:00:00 2001 From: jede Date: Tue, 22 Oct 2024 22:56:22 +0200 Subject: [PATCH 26/90] test --- .github/workflows/main.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 89405fd..69fc7b1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -76,15 +76,6 @@ jobs: echo "src/include" >> .git/info/sparse-checkout git checkout - - name: Setting bpm - # if: steps.cache-sdk.outputs.cache-hit != 'true' - run: | - mkdir ~/bin - cd bpm && pip install -r requirements.txt && cd .. - cp bpm/src/bpm ~/bin - chmod 755 ~/bin/bpm && export PATH=$PATH:~/bin && ls -l ~/bin/ - bpm -V - - name: Prepare environment for oricutron if: steps.cache-sdk.outputs.cache-hit != 'true' run: | @@ -135,6 +126,10 @@ jobs: - name: Prepare environment for project run: | + mkdir ~/bin + cd bpm && pip install -r requirements.txt && cd .. + cp bpm/src/bpm ~/bin + chmod 755 ~/bin/bpm && export PATH=$PATH:~/bin && ls -l ~/bin/ echo $PATH ls -l ~bin/ ls -l From da348d3dbfadf724d29c50facb29d04de6c30180 Mon Sep 17 00:00:00 2001 From: jede Date: Tue, 22 Oct 2024 22:59:36 +0200 Subject: [PATCH 27/90] fix --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 69fc7b1..7dcb93b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -134,11 +134,13 @@ jobs: ls -l ~bin/ ls -l bpm -V - ls -l && ls -l .. && ls -l ~/bin/ && mv cc65 ../ && mv orix-software ../ && mv orix-sdk ../ && mv md2hlp ../ + ls -l && ls -l .. && ls -l ~/bin/ && mv cc65 ../ && mv orix-software ../ && mv orix-sdk ../ && mv md2hlp ../ && mv bpm ../ - name: Compile project run: | + ls -l if [ -f "bpm.tml" ]; then + echo Using bpm ... CC65_HOME=${GITHUB_WORKSPACE}/../cc65 bpm build else CC65_HOME=${GITHUB_WORKSPACE}/../cc65 make From d6f3dd8842c7ad6dc9b546380c2971e560d74197 Mon Sep 17 00:00:00 2001 From: jede Date: Tue, 22 Oct 2024 23:01:52 +0200 Subject: [PATCH 28/90] fix --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7dcb93b..2f7133f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -141,7 +141,7 @@ jobs: ls -l if [ -f "bpm.tml" ]; then echo Using bpm ... - CC65_HOME=${GITHUB_WORKSPACE}/../cc65 bpm build + CC65_HOME=${GITHUB_WORKSPACE}/../cc65 python3 ../bpm/src/bpm build else CC65_HOME=${GITHUB_WORKSPACE}/../cc65 make fi From d55baba16e02adc501bec98cd1d329fc7913de68 Mon Sep 17 00:00:00 2001 From: jede Date: Tue, 22 Oct 2024 23:15:23 +0200 Subject: [PATCH 29/90] fix --- .github/workflows/main.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2f7133f..ec8c940 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -130,10 +130,6 @@ jobs: cd bpm && pip install -r requirements.txt && cd .. cp bpm/src/bpm ~/bin chmod 755 ~/bin/bpm && export PATH=$PATH:~/bin && ls -l ~/bin/ - echo $PATH - ls -l ~bin/ - ls -l - bpm -V ls -l && ls -l .. && ls -l ~/bin/ && mv cc65 ../ && mv orix-software ../ && mv orix-sdk ../ && mv md2hlp ../ && mv bpm ../ - name: Compile project @@ -141,6 +137,7 @@ jobs: ls -l if [ -f "bpm.tml" ]; then echo Using bpm ... + ../bpm/src/bpm plugins install orixsdk CC65_HOME=${GITHUB_WORKSPACE}/../cc65 python3 ../bpm/src/bpm build else CC65_HOME=${GITHUB_WORKSPACE}/../cc65 make From 7b87a8ad9223282ae8c9d7e48b5be5149f06798d Mon Sep 17 00:00:00 2001 From: jede Date: Tue, 22 Oct 2024 23:17:52 +0200 Subject: [PATCH 30/90] test --- .github/workflows/main.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ec8c940..2fac56c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -129,15 +129,16 @@ jobs: mkdir ~/bin cd bpm && pip install -r requirements.txt && cd .. cp bpm/src/bpm ~/bin - chmod 755 ~/bin/bpm && export PATH=$PATH:~/bin && ls -l ~/bin/ + chmod 755 ~/bin/bpm && export PATH=$PATH:~/bin ls -l && ls -l .. && ls -l ~/bin/ && mv cc65 ../ && mv orix-software ../ && mv orix-sdk ../ && mv md2hlp ../ && mv bpm ../ - name: Compile project run: | - ls -l + if [ -f "bpm.tml" ]; then + ls -l ~/bin echo Using bpm ... - ../bpm/src/bpm plugins install orixsdk + python3 ../bpm/src/bpm plugins install orixsdk CC65_HOME=${GITHUB_WORKSPACE}/../cc65 python3 ../bpm/src/bpm build else CC65_HOME=${GITHUB_WORKSPACE}/../cc65 make @@ -211,7 +212,7 @@ jobs: working-directory: ${{steps.download.outputs.download-path}} run: | if [ -f "bpm.tml" ]; then - bpm package + python3 ../bpm/src/bpm package else tar -zcvf $GITHUB_WORKSPACE/$ARCHIVE_NAME * fi @@ -220,7 +221,7 @@ jobs: run: | export BPM_PUBLISH_KEY = $hash if [ -f "bpm.tml" ]; then - if [ "$BRANCH_NAME" = "master" -o "$BRANCH_NAME" = "main" ]; then bpm publish --official; else bpm publish --alpha; fi + if [ "$BRANCH_NAME" = "master" -o "$BRANCH_NAME" = "main" ]; then python3 ../bpm/src/bpm publish --official; else python3 ../bpm/src/bpm publish --alpha; fi else if [ "$BRANCH_NAME" = "master" -o "$BRANCH_NAME" = "main" ]; then VERSION="$version"; else VERSION=alpha; bpm publish --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}" From 58ef384885520564e0d6020f8515dc074a5d0f1c Mon Sep 17 00:00:00 2001 From: jede Date: Tue, 22 Oct 2024 23:37:04 +0200 Subject: [PATCH 31/90] fix --- .github/workflows/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2fac56c..2af5e10 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -134,12 +134,12 @@ jobs: - name: Compile project run: | - + if [ -f "bpm.tml" ]; then ls -l ~/bin echo Using bpm ... - python3 ../bpm/src/bpm plugins install orixsdk - CC65_HOME=${GITHUB_WORKSPACE}/../cc65 python3 ../bpm/src/bpm build + python3 ../bpm/src/bpm --force-update plugins install orixsdk + CC65_HOME=${GITHUB_WORKSPACE}/../cc65 python3 ../bpm/src/bpm --force-update build else CC65_HOME=${GITHUB_WORKSPACE}/../cc65 make fi @@ -212,7 +212,7 @@ jobs: working-directory: ${{steps.download.outputs.download-path}} run: | if [ -f "bpm.tml" ]; then - python3 ../bpm/src/bpm package + python3 ../bpm/src/bpm --force-update package else tar -zcvf $GITHUB_WORKSPACE/$ARCHIVE_NAME * fi @@ -221,8 +221,8 @@ jobs: run: | export BPM_PUBLISH_KEY = $hash if [ -f "bpm.tml" ]; then - if [ "$BRANCH_NAME" = "master" -o "$BRANCH_NAME" = "main" ]; then python3 ../bpm/src/bpm publish --official; else python3 ../bpm/src/bpm publish --alpha; fi + if [ "$BRANCH_NAME" = "master" -o "$BRANCH_NAME" = "main" ]; then python3 ../bpm/src/bpm --force-update publish --official; else python3 --force-update ../bpm/src/bpm publish --alpha; fi else - if [ "$BRANCH_NAME" = "master" -o "$BRANCH_NAME" = "main" ]; then VERSION="$version"; else VERSION=alpha; bpm publish --alpha ; fi + 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}" fi From 382603fdac02ced1ee76211d289379c3be520f46 Mon Sep 17 00:00:00 2001 From: jede Date: Tue, 22 Oct 2024 23:43:28 +0200 Subject: [PATCH 32/90] disable cache bpm --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2af5e10..7d6f943 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -37,7 +37,7 @@ jobs: path: cc65 - name: Checkout bpm - if: steps.cache-sdk.outputs.cache-hit != 'true' + #if: steps.cache-sdk.outputs.cache-hit != 'true' uses: actions/checkout@v3 with: repository: orix-software/bpm From 6949e39cb44d14b0adc0d7e1b992b95d7d6c759e Mon Sep 17 00:00:00 2001 From: jede Date: Tue, 22 Oct 2024 23:59:00 +0200 Subject: [PATCH 33/90] fix --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7d6f943..e2d142a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,7 +27,7 @@ jobs: md2hlp/**/* orix-software/**/* bpm/**/* - key: ${{ runner.os }}-orix-sdk + key: ${{ secrets.CACHE_ID }}-orix-sdk - name: Checkout cc65 if: steps.cache-sdk.outputs.cache-hit != 'true' @@ -122,7 +122,7 @@ jobs: md2hlp/**/* orix-software/**/* bpm/**/* - key: ${{ runner.os }}-orix-sdk + key: ${{ secrets.CACHE_ID }}-orix-sdk - name: Prepare environment for project run: | From 31635daaa19c650f832df43cc90b7bac3a69b28f Mon Sep 17 00:00:00 2001 From: jede Date: Thu, 24 Oct 2024 00:07:33 +0200 Subject: [PATCH 34/90] fix --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e2d142a..29378b8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -212,6 +212,7 @@ jobs: working-directory: ${{steps.download.outputs.download-path}} run: | if [ -f "bpm.tml" ]; then + echo "../bpm/src/bpm" >> "$GITHUB_PATH" python3 ../bpm/src/bpm --force-update package else tar -zcvf $GITHUB_WORKSPACE/$ARCHIVE_NAME * @@ -220,6 +221,7 @@ jobs: - name: Upload to oric run: | export BPM_PUBLISH_KEY = $hash + bpm -V if [ -f "bpm.tml" ]; then if [ "$BRANCH_NAME" = "master" -o "$BRANCH_NAME" = "main" ]; then python3 ../bpm/src/bpm --force-update publish --official; else python3 --force-update ../bpm/src/bpm publish --alpha; fi else From f3f4313d3141d7818a5efb326913fbb3d077a4dd Mon Sep 17 00:00:00 2001 From: jede Date: Thu, 24 Oct 2024 00:11:25 +0200 Subject: [PATCH 35/90] fix --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 29378b8..43cadb2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,6 +27,7 @@ jobs: md2hlp/**/* orix-software/**/* bpm/**/* + oricutron/**/* key: ${{ secrets.CACHE_ID }}-orix-sdk - name: Checkout cc65 @@ -37,7 +38,7 @@ jobs: path: cc65 - name: Checkout bpm - #if: steps.cache-sdk.outputs.cache-hit != 'true' + if: steps.cache-sdk.outputs.cache-hit != 'true' uses: actions/checkout@v3 with: repository: orix-software/bpm @@ -77,7 +78,7 @@ jobs: git checkout - name: Prepare environment for oricutron - if: steps.cache-sdk.outputs.cache-hit != 'true' + #if: steps.cache-sdk.outputs.cache-hit != 'true' run: | sudo apt-get install -y xvfb libgtk-3-0 libgtk-3-dev libsdl1.2debian libsdl1.2-dev git clone https://github.com/pete-gordon/oricutron.git From 3bf67aa6d2a11b5e1c4c3388bcab621b2b9d3d13 Mon Sep 17 00:00:00 2001 From: jede Date: Thu, 24 Oct 2024 00:18:57 +0200 Subject: [PATCH 36/90] fix/test --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 43cadb2..59c02e5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -78,12 +78,12 @@ jobs: git checkout - name: Prepare environment for oricutron - #if: steps.cache-sdk.outputs.cache-hit != 'true' + if: steps.cache-sdk.outputs.cache-hit != 'true' run: | sudo apt-get install -y xvfb libgtk-3-0 libgtk-3-dev libsdl1.2debian libsdl1.2-dev git clone https://github.com/pete-gordon/oricutron.git cd oricutron && make && pwd && cd .. && ls -l && echo ${GITHUB_WORKSPACE} - echo Timeout oricutron : $secret.TMOUT_ORICUTRON + echo Timeout oricutron : ${secret}.TMOUT_ORICUTRON - name: Compile orix-sdk if: steps.cache-sdk.outputs.cache-hit != 'true' @@ -123,6 +123,7 @@ jobs: md2hlp/**/* orix-software/**/* bpm/**/* + oricutron/**/* key: ${{ secrets.CACHE_ID }}-orix-sdk - name: Prepare environment for project From 1d657ee4db38c684c0ccd2d1f815054845dcc47b Mon Sep 17 00:00:00 2001 From: jede Date: Thu, 24 Oct 2024 00:23:01 +0200 Subject: [PATCH 37/90] test --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 59c02e5..f200e01 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -130,15 +130,16 @@ jobs: run: | mkdir ~/bin cd bpm && pip install -r requirements.txt && cd .. - cp bpm/src/bpm ~/bin - chmod 755 ~/bin/bpm && export PATH=$PATH:~/bin + # cp bpm/src/bpm ~/bin + # chmod 755 ~/bin/bpm && export PATH=$PATH:~/bin ls -l && ls -l .. && ls -l ~/bin/ && mv cc65 ../ && mv orix-software ../ && mv orix-sdk ../ && mv md2hlp ../ && mv bpm ../ - name: Compile project run: | - if [ -f "bpm.tml" ]; then ls -l ~/bin + echo "../bpm/src/bpm" >> "$GITHUB_PATH" + bpm -V echo Using bpm ... python3 ../bpm/src/bpm --force-update plugins install orixsdk CC65_HOME=${GITHUB_WORKSPACE}/../cc65 python3 ../bpm/src/bpm --force-update build @@ -214,7 +215,6 @@ jobs: working-directory: ${{steps.download.outputs.download-path}} run: | if [ -f "bpm.tml" ]; then - echo "../bpm/src/bpm" >> "$GITHUB_PATH" python3 ../bpm/src/bpm --force-update package else tar -zcvf $GITHUB_WORKSPACE/$ARCHIVE_NAME * From ab5e3aa0c31a2b0afb8de34eb6231a3f8ef868c4 Mon Sep 17 00:00:00 2001 From: jede Date: Thu, 24 Oct 2024 00:25:57 +0200 Subject: [PATCH 38/90] test --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f200e01..65ca857 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -139,6 +139,9 @@ jobs: if [ -f "bpm.tml" ]; then ls -l ~/bin echo "../bpm/src/bpm" >> "$GITHUB_PATH" + echo $PATH + echo $GITHUB_PATH + echo "../cc65/" >> "$GITHUB_PATH" bpm -V echo Using bpm ... python3 ../bpm/src/bpm --force-update plugins install orixsdk From ab5ab8d0df4ee26f64108d3822c73e73923127e5 Mon Sep 17 00:00:00 2001 From: jede Date: Thu, 24 Oct 2024 00:37:59 +0200 Subject: [PATCH 39/90] fix --- .github/workflows/main.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 65ca857..5fe90b2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -138,10 +138,14 @@ jobs: run: | if [ -f "bpm.tml" ]; then ls -l ~/bin - echo "../bpm/src/bpm" >> "$GITHUB_PATH" + echo "../bpm/src/bpm" >> $GITHUB_PATH + echo PATH echo $PATH + echo GITHUB PATH echo $GITHUB_PATH - echo "../cc65/" >> "$GITHUB_PATH" + echo "../cc65/" >> $GITHUB_PATH + echo ls + ls -l bpm -V echo Using bpm ... python3 ../bpm/src/bpm --force-update plugins install orixsdk From c161e2f96c47131bdb2470346a1e6a37db6c52ad Mon Sep 17 00:00:00 2001 From: jede Date: Thu, 24 Oct 2024 00:40:51 +0200 Subject: [PATCH 40/90] fix --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5fe90b2..9015026 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -139,6 +139,7 @@ jobs: if [ -f "bpm.tml" ]; then ls -l ~/bin echo "../bpm/src/bpm" >> $GITHUB_PATH + export PATH=$PATH:../bpm/src/ echo PATH echo $PATH echo GITHUB PATH From eefd90f8a7f4be00ba560e064eae9fa396529af2 Mon Sep 17 00:00:00 2001 From: jede Date: Thu, 24 Oct 2024 00:42:04 +0200 Subject: [PATCH 41/90] fix --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9015026..470bbbb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -140,6 +140,7 @@ jobs: ls -l ~/bin echo "../bpm/src/bpm" >> $GITHUB_PATH export PATH=$PATH:../bpm/src/ + chmod 755 ../bpm/src/bpm echo PATH echo $PATH echo GITHUB PATH From dcc0eb1725cbbcb357c336c2aac6c6e4ceb684e1 Mon Sep 17 00:00:00 2001 From: jede Date: Thu, 24 Oct 2024 00:50:56 +0200 Subject: [PATCH 42/90] fix --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 470bbbb..ed64299 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -139,7 +139,7 @@ jobs: if [ -f "bpm.tml" ]; then ls -l ~/bin echo "../bpm/src/bpm" >> $GITHUB_PATH - export PATH=$PATH:../bpm/src/ + export PATH=$PATH:../bpm/src/:../cc65 chmod 755 ../bpm/src/bpm echo PATH echo $PATH From 3ad61921248d7fc1d03ab4dd1172840fba7bd866 Mon Sep 17 00:00:00 2001 From: jede Date: Thu, 24 Oct 2024 00:56:24 +0200 Subject: [PATCH 43/90] test --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ed64299..8221db3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -148,6 +148,7 @@ jobs: echo "../cc65/" >> $GITHUB_PATH echo ls ls -l + bpm --force-update bpm -V echo Using bpm ... python3 ../bpm/src/bpm --force-update plugins install orixsdk From f70209c103ba6622161c9c03364381cec955d3cf Mon Sep 17 00:00:00 2001 From: jede Date: Thu, 24 Oct 2024 00:58:11 +0200 Subject: [PATCH 44/90] test --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8221db3..1213f4f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,7 +38,7 @@ jobs: path: cc65 - name: Checkout bpm - if: steps.cache-sdk.outputs.cache-hit != 'true' + #if: steps.cache-sdk.outputs.cache-hit != 'true' uses: actions/checkout@v3 with: repository: orix-software/bpm From bc3ebbf0121c92e1d0e992c1ca712697dfc49d2e Mon Sep 17 00:00:00 2001 From: jede Date: Thu, 24 Oct 2024 23:02:00 +0200 Subject: [PATCH 45/90] test --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1213f4f..351fb56 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -148,6 +148,7 @@ jobs: echo "../cc65/" >> $GITHUB_PATH echo ls ls -l + bpm -V bpm --force-update bpm -V echo Using bpm ... From 46f7178901f83cdbdcdce9fc576884f2f2d199b9 Mon Sep 17 00:00:00 2001 From: jede Date: Thu, 24 Oct 2024 23:03:46 +0200 Subject: [PATCH 46/90] fix --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 351fb56..d79ef80 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -148,7 +148,7 @@ jobs: echo "../cc65/" >> $GITHUB_PATH echo ls ls -l - bpm -V + bpm --disable-check-update -V bpm --force-update bpm -V echo Using bpm ... From 5407d2f2200d36a1f28434ccadaa6896596ac0a5 Mon Sep 17 00:00:00 2001 From: jede Date: Thu, 24 Oct 2024 23:08:33 +0200 Subject: [PATCH 47/90] test2 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d79ef80..85f8090 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -149,7 +149,7 @@ jobs: echo ls ls -l bpm --disable-check-update -V - bpm --force-update + bpm --force-update -V bpm -V echo Using bpm ... python3 ../bpm/src/bpm --force-update plugins install orixsdk From dc2aa5e4a4c9f3b0659f29002461cff2884e883c Mon Sep 17 00:00:00 2001 From: jede Date: Thu, 24 Oct 2024 23:10:11 +0200 Subject: [PATCH 48/90] test --- .github/workflows/main.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 85f8090..5fc62ab 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -139,6 +139,10 @@ jobs: if [ -f "bpm.tml" ]; then ls -l ~/bin echo "../bpm/src/bpm" >> $GITHUB_PATH + echo pwd + pwd + ls -l + ls -l ../ export PATH=$PATH:../bpm/src/:../cc65 chmod 755 ../bpm/src/bpm echo PATH From 894d3a26f8abd979dc87984a59d0a89b54cc3ca5 Mon Sep 17 00:00:00 2001 From: jede Date: Thu, 24 Oct 2024 23:15:42 +0200 Subject: [PATCH 49/90] fix --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5fc62ab..277d0b6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -137,7 +137,8 @@ jobs: - name: Compile project run: | if [ -f "bpm.tml" ]; then - ls -l ~/bin + ls -l ~/bin + CC65_HOME=${GITHUB_WORKSPACE}/../cc65 echo "../bpm/src/bpm" >> $GITHUB_PATH echo pwd pwd From f14853865f161326e160f7e014f404da4afb98b9 Mon Sep 17 00:00:00 2001 From: jede Date: Thu, 24 Oct 2024 23:19:51 +0200 Subject: [PATCH 50/90] test --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 277d0b6..3e123e1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -143,8 +143,8 @@ jobs: echo pwd pwd ls -l - ls -l ../ - export PATH=$PATH:../bpm/src/:../cc65 + ls -l ../cc65 + export PATH=$PATH:../bpm/src/:/home/runner/work/file/cc65 chmod 755 ../bpm/src/bpm echo PATH echo $PATH From fd761e695d067642ea32dac3207dc70cf883cfa9 Mon Sep 17 00:00:00 2001 From: jede Date: Thu, 24 Oct 2024 23:21:59 +0200 Subject: [PATCH 51/90] fix --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3e123e1..cdf1a45 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -144,7 +144,7 @@ jobs: pwd ls -l ls -l ../cc65 - export PATH=$PATH:../bpm/src/:/home/runner/work/file/cc65 + export PATH=$PATH:../bpm/src/:/home/runner/work/file/cc65/bin chmod 755 ../bpm/src/bpm echo PATH echo $PATH From 3ef4942df4fe5c5dbd4313ff648d9c69d11f4a3b Mon Sep 17 00:00:00 2001 From: jede Date: Thu, 24 Oct 2024 23:24:28 +0200 Subject: [PATCH 52/90] fix --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cdf1a45..2efde4b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -139,6 +139,8 @@ jobs: if [ -f "bpm.tml" ]; then ls -l ~/bin CC65_HOME=${GITHUB_WORKSPACE}/../cc65 + echo CC65_HOME + echo $CC65_HOME echo "../bpm/src/bpm" >> $GITHUB_PATH echo pwd pwd @@ -150,7 +152,7 @@ jobs: echo $PATH echo GITHUB PATH echo $GITHUB_PATH - echo "../cc65/" >> $GITHUB_PATH + echo "/home/runner/work/file/cc65/bin" >> $GITHUB_PATH echo ls ls -l bpm --disable-check-update -V From 7dfc2e75ce0df6029da21e077772e43201c4a042 Mon Sep 17 00:00:00 2001 From: jede Date: Thu, 24 Oct 2024 23:27:07 +0200 Subject: [PATCH 53/90] fix --- .github/workflows/main.yml | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2efde4b..a900e73 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -139,28 +139,16 @@ jobs: if [ -f "bpm.tml" ]; then ls -l ~/bin CC65_HOME=${GITHUB_WORKSPACE}/../cc65 - echo CC65_HOME - echo $CC65_HOME echo "../bpm/src/bpm" >> $GITHUB_PATH - echo pwd - pwd - ls -l - ls -l ../cc65 - export PATH=$PATH:../bpm/src/:/home/runner/work/file/cc65/bin + export PATH=$PATH:../bpm/src/:/home/runner/work/..//cc65/bin chmod 755 ../bpm/src/bpm - echo PATH - echo $PATH - echo GITHUB PATH - echo $GITHUB_PATH - echo "/home/runner/work/file/cc65/bin" >> $GITHUB_PATH - echo ls - ls -l + echo "/home/runner/work/..//cc65/bin" >> $GITHUB_PATH bpm --disable-check-update -V bpm --force-update -V bpm -V echo Using bpm ... python3 ../bpm/src/bpm --force-update plugins install orixsdk - CC65_HOME=${GITHUB_WORKSPACE}/../cc65 python3 ../bpm/src/bpm --force-update build + bpm --force-update build else CC65_HOME=${GITHUB_WORKSPACE}/../cc65 make fi From e7eca80e804c12bdc3217cbefadb78991a8931fe Mon Sep 17 00:00:00 2001 From: jede Date: Thu, 24 Oct 2024 23:29:58 +0200 Subject: [PATCH 54/90] fix --- .github/workflows/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a900e73..07f3a79 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -137,18 +137,18 @@ jobs: - name: Compile project run: | if [ -f "bpm.tml" ]; then - ls -l ~/bin CC65_HOME=${GITHUB_WORKSPACE}/../cc65 + echo "../bpm/src/bpm" >> $GITHUB_PATH - export PATH=$PATH:../bpm/src/:/home/runner/work/..//cc65/bin + export PATH=$PATH:../bpm/src/:/home/runner/work/file/cc65/bin chmod 755 ../bpm/src/bpm - echo "/home/runner/work/..//cc65/bin" >> $GITHUB_PATH + echo "/home/runner/work/file/cc65/bin" >> $GITHUB_PATH bpm --disable-check-update -V bpm --force-update -V bpm -V echo Using bpm ... - python3 ../bpm/src/bpm --force-update plugins install orixsdk - bpm --force-update build + bpm --force-update plugins install orixsdk + bpm --force-update build else CC65_HOME=${GITHUB_WORKSPACE}/../cc65 make fi From b76fa3e80155cf9a5a96288a8f576358de19286a Mon Sep 17 00:00:00 2001 From: jede Date: Thu, 24 Oct 2024 23:31:55 +0200 Subject: [PATCH 55/90] fix --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 07f3a79..ef6ff1b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -138,7 +138,7 @@ jobs: run: | if [ -f "bpm.tml" ]; then CC65_HOME=${GITHUB_WORKSPACE}/../cc65 - + pwd echo "../bpm/src/bpm" >> $GITHUB_PATH export PATH=$PATH:../bpm/src/:/home/runner/work/file/cc65/bin chmod 755 ../bpm/src/bpm From 5cd8556e5c53be17301ec142d0532b5e0c5a24ab Mon Sep 17 00:00:00 2001 From: jede Date: Thu, 24 Oct 2024 23:35:42 +0200 Subject: [PATCH 56/90] fix --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ef6ff1b..8a45cea 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -138,6 +138,9 @@ jobs: run: | if [ -f "bpm.tml" ]; then CC65_HOME=${GITHUB_WORKSPACE}/../cc65 + #/home/runner/work/file/file + echo ${GITHUB_WORKSPACE} + ls -l ${GITHUB_WORKSPACE} pwd echo "../bpm/src/bpm" >> $GITHUB_PATH export PATH=$PATH:../bpm/src/:/home/runner/work/file/cc65/bin From 03c214cc5e79a430c1a38bc12dd9df2bbb1b1715 Mon Sep 17 00:00:00 2001 From: jede Date: Thu, 24 Oct 2024 23:39:09 +0200 Subject: [PATCH 57/90] test --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8a45cea..1e0aab8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -143,7 +143,9 @@ jobs: ls -l ${GITHUB_WORKSPACE} pwd echo "../bpm/src/bpm" >> $GITHUB_PATH - export PATH=$PATH:../bpm/src/:/home/runner/work/file/cc65/bin + export PATH=$PATH:../bpm/src/:${GITHUB_WORKSPACE}/../cc65/bin + #/home/runner/work/file/cc65/bin + #${GITHUB_WORKSPACE}/../cc65 chmod 755 ../bpm/src/bpm echo "/home/runner/work/file/cc65/bin" >> $GITHUB_PATH bpm --disable-check-update -V From f4915299dc860d9e12190456158a5defd9fa13a2 Mon Sep 17 00:00:00 2001 From: jede Date: Thu, 24 Oct 2024 23:42:49 +0200 Subject: [PATCH 58/90] test --- .github/workflows/main.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1e0aab8..6bcb931 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -138,14 +138,9 @@ jobs: run: | if [ -f "bpm.tml" ]; then CC65_HOME=${GITHUB_WORKSPACE}/../cc65 - #/home/runner/work/file/file - echo ${GITHUB_WORKSPACE} - ls -l ${GITHUB_WORKSPACE} - pwd echo "../bpm/src/bpm" >> $GITHUB_PATH + echo ${GITHUB_WORKSPACE}/../cc65/bin >> $GITHUB_PATH export PATH=$PATH:../bpm/src/:${GITHUB_WORKSPACE}/../cc65/bin - #/home/runner/work/file/cc65/bin - #${GITHUB_WORKSPACE}/../cc65 chmod 755 ../bpm/src/bpm echo "/home/runner/work/file/cc65/bin" >> $GITHUB_PATH bpm --disable-check-update -V @@ -163,10 +158,12 @@ jobs: git clone https://github.com/orix-software/docker-unit-test.git cd docker-unit-test && bash install.sh ${GITHUB_WORKSPACE} && cd .. if [ -d "tests/build/" ] && [ "$(ls -A tests/build/" ]; then + echo "Tests found, let's start" cp tests/build/* > ${GITHUB_WORKSPACE}/oricutron/sdcard/BIN echo "#!/bin/submit\n" > ${GITHUB_WORKSPACE}/oricutron/sdcard/ETC/AUTOBOOT cp tests/run.sub >> ${GITHUB_WORKSPACE}/oricutron/sdcard/ETC/AUTOBOOT cd ${GITHUB_WORKSPACE}/oricutron + echo "Start Oricutron" timeout --preserve-status 10 ./xvfb.sh || exit 0 fi From ec16587d1bdcc5f71e171ccfc59942a5caa6bce4 Mon Sep 17 00:00:00 2001 From: jede Date: Thu, 24 Oct 2024 23:49:47 +0200 Subject: [PATCH 59/90] test --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6bcb931..6399c31 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -137,14 +137,15 @@ jobs: - name: Compile project run: | if [ -f "bpm.tml" ]; then + ls -l ${GITHUB_WORKSPACE} + ls -l ${GITHUB_WORKSPACE}/oricutron CC65_HOME=${GITHUB_WORKSPACE}/../cc65 echo "../bpm/src/bpm" >> $GITHUB_PATH echo ${GITHUB_WORKSPACE}/../cc65/bin >> $GITHUB_PATH export PATH=$PATH:../bpm/src/:${GITHUB_WORKSPACE}/../cc65/bin chmod 755 ../bpm/src/bpm echo "/home/runner/work/file/cc65/bin" >> $GITHUB_PATH - bpm --disable-check-update -V - bpm --force-update -V + echo "Bpm version :" bpm -V echo Using bpm ... bpm --force-update plugins install orixsdk From aee1810d2ab85e084e86040aca0eb098754a0dbc Mon Sep 17 00:00:00 2001 From: jede Date: Thu, 24 Oct 2024 23:51:45 +0200 Subject: [PATCH 60/90] fix --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6399c31..e640499 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -146,7 +146,7 @@ jobs: chmod 755 ../bpm/src/bpm echo "/home/runner/work/file/cc65/bin" >> $GITHUB_PATH echo "Bpm version :" - bpm -V + bpm --force-update -V echo Using bpm ... bpm --force-update plugins install orixsdk bpm --force-update build From badd22b64bd33c2f10dae7ef1a0454f124bc3852 Mon Sep 17 00:00:00 2001 From: jede Date: Thu, 24 Oct 2024 23:56:38 +0200 Subject: [PATCH 61/90] fix --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e640499..6082544 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -139,6 +139,7 @@ jobs: if [ -f "bpm.tml" ]; then ls -l ${GITHUB_WORKSPACE} ls -l ${GITHUB_WORKSPACE}/oricutron + echo "Workspace : ${GITHUB_WORKSPACE}" CC65_HOME=${GITHUB_WORKSPACE}/../cc65 echo "../bpm/src/bpm" >> $GITHUB_PATH echo ${GITHUB_WORKSPACE}/../cc65/bin >> $GITHUB_PATH @@ -156,6 +157,7 @@ jobs: - name: Unit-test with oricutron run: | + echo "Workspace : ${GITHUB_WORKSPACE}" git clone https://github.com/orix-software/docker-unit-test.git cd docker-unit-test && bash install.sh ${GITHUB_WORKSPACE} && cd .. if [ -d "tests/build/" ] && [ "$(ls -A tests/build/" ]; then From 4dfe80fc58ad9a575bfe20b215ec2809f48659b8 Mon Sep 17 00:00:00 2001 From: jede Date: Thu, 24 Oct 2024 23:58:46 +0200 Subject: [PATCH 62/90] test --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6082544..18132ff 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -158,6 +158,7 @@ jobs: - name: Unit-test with oricutron run: | echo "Workspace : ${GITHUB_WORKSPACE}" + ls -l ${GITHUB_WORKSPACE} git clone https://github.com/orix-software/docker-unit-test.git cd docker-unit-test && bash install.sh ${GITHUB_WORKSPACE} && cd .. if [ -d "tests/build/" ] && [ "$(ls -A tests/build/" ]; then From 3fadb80941b7b61c2ca72db5de311229dc8a03db Mon Sep 17 00:00:00 2001 From: jede Date: Fri, 25 Oct 2024 00:00:03 +0200 Subject: [PATCH 63/90] fix --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 18132ff..900196e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -159,6 +159,8 @@ jobs: run: | echo "Workspace : ${GITHUB_WORKSPACE}" ls -l ${GITHUB_WORKSPACE} + ls -l ${GITHUB_WORKSPACE}/oricutron + ls -l ${GITHUB_WORKSPACE}/oricutron/roms git clone https://github.com/orix-software/docker-unit-test.git cd docker-unit-test && bash install.sh ${GITHUB_WORKSPACE} && cd .. if [ -d "tests/build/" ] && [ "$(ls -A tests/build/" ]; then From cbf3038a8cae727fd8df1cc2a9d1d2e316c1ad1d Mon Sep 17 00:00:00 2001 From: jede Date: Sat, 26 Oct 2024 23:28:06 +0200 Subject: [PATCH 64/90] fix --- .github/workflows/main.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 900196e..8db7477 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -175,8 +175,10 @@ jobs: - name: Check unit-test run: | - ls -l ${GITHUB_WORKSPACE}/oricutron/sdcard/ - bash tests/unit-tests/verify.sh ${GITHUB_WORKSPACE}/oricutron/sdcard/ + if [ -d "tests/build/" ] && [ "$(ls -A tests/build/" ]; then + ls -l ${GITHUB_WORKSPACE}/oricutron/sdcard/ + bash tests/unit-tests/verify.sh ${GITHUB_WORKSPACE}/oricutron/sdcard/ + fi - name: List build directory content run: ls -lR build From ab1f254e376423173209e4d30978aeaf8d0af1b5 Mon Sep 17 00:00:00 2001 From: jede Date: Sat, 26 Oct 2024 23:31:43 +0200 Subject: [PATCH 65/90] fix --- .github/workflows/main.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8db7477..d75d24b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,7 +14,7 @@ on: jobs: # This workflow contains a single job called "build" setup-sdk: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Cache sdk @@ -100,7 +100,7 @@ jobs: build: # The type of runner that the job will run on needs: setup-sdk - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 outputs: version: ${{ steps.job_vars.outputs.VERSION }} repo_name: ${{ steps.job_vars.outputs.REPO_NAME }} @@ -161,9 +161,10 @@ jobs: ls -l ${GITHUB_WORKSPACE} ls -l ${GITHUB_WORKSPACE}/oricutron ls -l ${GITHUB_WORKSPACE}/oricutron/roms - git clone https://github.com/orix-software/docker-unit-test.git - cd docker-unit-test && bash install.sh ${GITHUB_WORKSPACE} && cd .. + if [ -d "tests/build/" ] && [ "$(ls -A tests/build/" ]; then + git clone https://github.com/orix-software/docker-unit-test.git + cd docker-unit-test && bash install.sh ${GITHUB_WORKSPACE} && cd .. echo "Tests found, let's start" cp tests/build/* > ${GITHUB_WORKSPACE}/oricutron/sdcard/BIN echo "#!/bin/submit\n" > ${GITHUB_WORKSPACE}/oricutron/sdcard/ETC/AUTOBOOT @@ -196,7 +197,7 @@ jobs: upload: needs: build - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 defaults: run: shell: bash From ddd6f7eab889fbcc34b9b3ad9f87bf582a564cb6 Mon Sep 17 00:00:00 2001 From: jede Date: Sat, 26 Oct 2024 23:40:12 +0200 Subject: [PATCH 66/90] fix --- .github/workflows/main.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d75d24b..29c1895 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -148,6 +148,7 @@ jobs: echo "/home/runner/work/file/cc65/bin" >> $GITHUB_PATH echo "Bpm version :" bpm --force-update -V + bpm --force-update -V echo Using bpm ... bpm --force-update plugins install orixsdk bpm --force-update build @@ -158,10 +159,7 @@ jobs: - name: Unit-test with oricutron run: | echo "Workspace : ${GITHUB_WORKSPACE}" - ls -l ${GITHUB_WORKSPACE} - ls -l ${GITHUB_WORKSPACE}/oricutron - ls -l ${GITHUB_WORKSPACE}/oricutron/roms - + ls ls -A tests/build/ if [ -d "tests/build/" ] && [ "$(ls -A tests/build/" ]; then git clone https://github.com/orix-software/docker-unit-test.git cd docker-unit-test && bash install.sh ${GITHUB_WORKSPACE} && cd .. From 35d531c1906a54a7fe73b5d3451ef55145d8efd7 Mon Sep 17 00:00:00 2001 From: jede Date: Sat, 26 Oct 2024 23:42:02 +0200 Subject: [PATCH 67/90] test --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 29c1895..c08d3d0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -159,7 +159,7 @@ jobs: - name: Unit-test with oricutron run: | echo "Workspace : ${GITHUB_WORKSPACE}" - ls ls -A tests/build/ + ls -A tests/build/ if [ -d "tests/build/" ] && [ "$(ls -A tests/build/" ]; then git clone https://github.com/orix-software/docker-unit-test.git cd docker-unit-test && bash install.sh ${GITHUB_WORKSPACE} && cd .. From 77e11cd3ef8e1100b24a02de9eb237561ee00529 Mon Sep 17 00:00:00 2001 From: jede Date: Sat, 26 Oct 2024 23:58:23 +0200 Subject: [PATCH 68/90] fix --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c08d3d0..d55bc90 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -159,6 +159,7 @@ jobs: - name: Unit-test with oricutron run: | echo "Workspace : ${GITHUB_WORKSPACE}" + echo Checking if there is unit tests ls -A tests/build/ if [ -d "tests/build/" ] && [ "$(ls -A tests/build/" ]; then git clone https://github.com/orix-software/docker-unit-test.git From 0ccedaf4f7853600d9fe2f409230161dc1ea3e75 Mon Sep 17 00:00:00 2001 From: jede Date: Sun, 27 Oct 2024 00:00:28 +0200 Subject: [PATCH 69/90] fix --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d55bc90..90e1e5c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -160,7 +160,6 @@ jobs: run: | echo "Workspace : ${GITHUB_WORKSPACE}" echo Checking if there is unit tests - ls -A tests/build/ if [ -d "tests/build/" ] && [ "$(ls -A tests/build/" ]; then git clone https://github.com/orix-software/docker-unit-test.git cd docker-unit-test && bash install.sh ${GITHUB_WORKSPACE} && cd .. From 7d7bdf990b60f6afe829216204bf82bfb898d851 Mon Sep 17 00:00:00 2001 From: jede Date: Sun, 27 Oct 2024 00:02:29 +0200 Subject: [PATCH 70/90] fix --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 90e1e5c..a23a85f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -161,6 +161,9 @@ jobs: echo "Workspace : ${GITHUB_WORKSPACE}" echo Checking if there is unit tests if [ -d "tests/build/" ] && [ "$(ls -A tests/build/" ]; then + echo "########################################################" + echo "# Unit tests found : Starting Oricutron with tests #" + echo "########################################################" git clone https://github.com/orix-software/docker-unit-test.git cd docker-unit-test && bash install.sh ${GITHUB_WORKSPACE} && cd .. echo "Tests found, let's start" From 938d8e5fcbb7c68a76361568e03d56fb9e571db8 Mon Sep 17 00:00:00 2001 From: jede Date: Sun, 27 Oct 2024 00:10:20 +0200 Subject: [PATCH 71/90] fix --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a23a85f..2656f31 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -160,7 +160,7 @@ jobs: run: | echo "Workspace : ${GITHUB_WORKSPACE}" echo Checking if there is unit tests - if [ -d "tests/build/" ] && [ "$(ls -A tests/build/" ]; then + if [ -d "tests/build/" ] && [ "$(ls -A tests/build/)" ]; then echo "########################################################" echo "# Unit tests found : Starting Oricutron with tests #" echo "########################################################" From ac56bff4c8bc8d21344ac344d4f0f23e64661aa3 Mon Sep 17 00:00:00 2001 From: jede Date: Sun, 27 Oct 2024 00:11:30 +0200 Subject: [PATCH 72/90] fix --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2656f31..0dbde1c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -177,7 +177,7 @@ jobs: - name: Check unit-test run: | - if [ -d "tests/build/" ] && [ "$(ls -A tests/build/" ]; then + if [ -d "tests/build/" ] && [ "$(ls -A tests/build/)" ]; then ls -l ${GITHUB_WORKSPACE}/oricutron/sdcard/ bash tests/unit-tests/verify.sh ${GITHUB_WORKSPACE}/oricutron/sdcard/ fi From 44fb5ddbea4746339afe0250ec1c7962f830f4ec Mon Sep 17 00:00:00 2001 From: jede Date: Sun, 27 Oct 2024 00:14:39 +0200 Subject: [PATCH 73/90] fix --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0dbde1c..04be063 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -240,9 +240,10 @@ jobs: - name: Upload to oric run: | - export BPM_PUBLISH_KEY = $hash - bpm -V + if [ -f "bpm.tml" ]; then + BPM_PUBLISH_KEY = $hash + bpm -V if [ "$BRANCH_NAME" = "master" -o "$BRANCH_NAME" = "main" ]; then python3 ../bpm/src/bpm --force-update publish --official; else python3 --force-update ../bpm/src/bpm publish --alpha; fi else if [ "$BRANCH_NAME" = "master" -o "$BRANCH_NAME" = "main" ]; then VERSION="$version"; else VERSION=alpha; fi From 3cb653793e3ffe18f76046b3d448d55c67fe8666 Mon Sep 17 00:00:00 2001 From: jede Date: Sun, 27 Oct 2024 00:19:05 +0200 Subject: [PATCH 74/90] fix --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 04be063..3552e35 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -242,6 +242,7 @@ jobs: run: | if [ -f "bpm.tml" ]; then + echo "Use bpm for upload" BPM_PUBLISH_KEY = $hash bpm -V if [ "$BRANCH_NAME" = "master" -o "$BRANCH_NAME" = "main" ]; then python3 ../bpm/src/bpm --force-update publish --official; else python3 --force-update ../bpm/src/bpm publish --alpha; fi From a1916532750589c3cd35f4172c864782c3b2ff31 Mon Sep 17 00:00:00 2001 From: jede Date: Sun, 27 Oct 2024 00:24:25 +0200 Subject: [PATCH 75/90] fix --- .github/workflows/main.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3552e35..136a12a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -232,15 +232,18 @@ jobs: - name: Make archive working-directory: ${{steps.download.outputs.download-path}} run: | + ls -l if [ -f "bpm.tml" ]; then + echo "Use bpm for archive" python3 ../bpm/src/bpm --force-update package else + echo "Use tar for archive" tar -zcvf $GITHUB_WORKSPACE/$ARCHIVE_NAME * fi - name: Upload to oric run: | - + ls -l if [ -f "bpm.tml" ]; then echo "Use bpm for upload" BPM_PUBLISH_KEY = $hash From 5902defffa2b4542ce4cb6a9fea8fdc1eb609427 Mon Sep 17 00:00:00 2001 From: jede Date: Sun, 27 Oct 2024 00:31:33 +0200 Subject: [PATCH 76/90] fix bpm --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 136a12a..15e9c28 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -244,7 +244,7 @@ jobs: - name: Upload to oric run: | ls -l - if [ -f "bpm.tml" ]; then + if [ -f "etc/bpm/" ]; then echo "Use bpm for upload" BPM_PUBLISH_KEY = $hash bpm -V From 268fbae94d3e3fcc27c24bde3a1e57323709af9a Mon Sep 17 00:00:00 2001 From: jede Date: Mon, 28 Oct 2024 14:17:35 +0100 Subject: [PATCH 77/90] fix test --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 15e9c28..e19f684 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -233,7 +233,7 @@ jobs: working-directory: ${{steps.download.outputs.download-path}} run: | ls -l - if [ -f "bpm.tml" ]; then + if [ -f "etc/bpm/" ]; then echo "Use bpm for archive" python3 ../bpm/src/bpm --force-update package else @@ -244,7 +244,9 @@ jobs: - name: Upload to oric run: | ls -l + find / -name "bpm.tml" -exec cp {} . \; if [ -f "etc/bpm/" ]; then + cp etc/bpm/* . -adpR echo "Use bpm for upload" BPM_PUBLISH_KEY = $hash bpm -V From 1e8bae39ff0d80334063a1b0e925afebbc360bc4 Mon Sep 17 00:00:00 2001 From: jede Date: Mon, 28 Oct 2024 14:19:27 +0100 Subject: [PATCH 78/90] fix --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e19f684..93a242b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -233,6 +233,7 @@ jobs: working-directory: ${{steps.download.outputs.download-path}} run: | ls -l + find / -name "bpm.tml" -exec cp {} . \; if [ -f "etc/bpm/" ]; then echo "Use bpm for archive" python3 ../bpm/src/bpm --force-update package From 95b155d9c92db02e7f391f681cdcd81a37419791 Mon Sep 17 00:00:00 2001 From: jede Date: Mon, 28 Oct 2024 14:22:39 +0100 Subject: [PATCH 79/90] fix --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 93a242b..f59dce1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -233,7 +233,7 @@ jobs: working-directory: ${{steps.download.outputs.download-path}} run: | ls -l - find / -name "bpm.tml" -exec cp {} . \; + find . -name "bpm.tml" -exec cp {} . \; if [ -f "etc/bpm/" ]; then echo "Use bpm for archive" python3 ../bpm/src/bpm --force-update package @@ -245,7 +245,7 @@ jobs: - name: Upload to oric run: | ls -l - find / -name "bpm.tml" -exec cp {} . \; + find . -name "bpm.tml" -exec cp {} . \; if [ -f "etc/bpm/" ]; then cp etc/bpm/* . -adpR echo "Use bpm for upload" From 344d80fd0f375b5a7c608ff892e032619132e036 Mon Sep 17 00:00:00 2001 From: jede Date: Mon, 28 Oct 2024 14:29:49 +0100 Subject: [PATCH 80/90] fix --- .github/workflows/main.yml | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f59dce1..1b16adc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -196,6 +196,12 @@ jobs: - name: Post compilation run: mv ../cc65 . && mv ../orix-software . && mv ../orix-sdk . && mv ../md2hlp . + - name: Upload if bpm + run: | + if [ -f "bpm.tml" ]; then + if [ "$BRANCH_NAME" = "master" -o "$BRANCH_NAME" = "main" ]; then python3 ../bpm/src/bpm --force-update publish --official; else python3 --force-update ../bpm/src/bpm publish --alpha; fi + fi + upload: needs: build runs-on: ubuntu-24.04 @@ -232,27 +238,12 @@ jobs: - name: Make archive working-directory: ${{steps.download.outputs.download-path}} run: | - ls -l - find . -name "bpm.tml" -exec cp {} . \; - if [ -f "etc/bpm/" ]; then - echo "Use bpm for archive" - python3 ../bpm/src/bpm --force-update package - else - echo "Use tar for archive" - tar -zcvf $GITHUB_WORKSPACE/$ARCHIVE_NAME * - fi + echo "Use tar for archive" + tar -zcvf $GITHUB_WORKSPACE/$ARCHIVE_NAME * + - name: Upload to oric run: | - ls -l - find . -name "bpm.tml" -exec cp {} . \; - if [ -f "etc/bpm/" ]; then - cp etc/bpm/* . -adpR - echo "Use bpm for upload" - BPM_PUBLISH_KEY = $hash - bpm -V - if [ "$BRANCH_NAME" = "master" -o "$BRANCH_NAME" = "main" ]; then python3 ../bpm/src/bpm --force-update publish --official; else python3 --force-update ../bpm/src/bpm publish --alpha; fi - else - 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}" - fi + 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}" + From f3957b0c1f4ccdc1dddf007be498e06bc0d8bbe1 Mon Sep 17 00:00:00 2001 From: jede Date: Mon, 28 Oct 2024 14:33:50 +0100 Subject: [PATCH 81/90] fix --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1b16adc..1d70a95 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -199,7 +199,7 @@ jobs: - name: Upload if bpm run: | if [ -f "bpm.tml" ]; then - if [ "$BRANCH_NAME" = "master" -o "$BRANCH_NAME" = "main" ]; then python3 ../bpm/src/bpm --force-update publish --official; else python3 --force-update ../bpm/src/bpm publish --alpha; fi + if [ "$BRANCH_NAME" = "master" -o "$BRANCH_NAME" = "main" ]; then bpm --force-update -V;--force-update publish --official; else bpm publish --alpha; fi fi upload: From fb84d34083037f378151bebb489c5ad986912b41 Mon Sep 17 00:00:00 2001 From: jede Date: Mon, 28 Oct 2024 14:35:33 +0100 Subject: [PATCH 82/90] fix --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1d70a95..bb4feea 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -199,7 +199,8 @@ jobs: - name: Upload if bpm run: | if [ -f "bpm.tml" ]; then - if [ "$BRANCH_NAME" = "master" -o "$BRANCH_NAME" = "main" ]; then bpm --force-update -V;--force-update publish --official; else bpm publish --alpha; fi + export PATH=$PATH:../bpm/src/:${GITHUB_WORKSPACE}/../cc65/bin + if [ "$BRANCH_NAME" = "master" -o "$BRANCH_NAME" = "main" ]; then bpm --force-update -V;--force-update publish --official; else bpm publish --alpha; fi fi upload: From 087ae8eafb935f12e7d2a605d855718eb23fdcb1 Mon Sep 17 00:00:00 2001 From: jede Date: Mon, 28 Oct 2024 14:37:27 +0100 Subject: [PATCH 83/90] fix --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bb4feea..2655ea7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -199,6 +199,7 @@ jobs: - name: Upload if bpm run: | if [ -f "bpm.tml" ]; then + export BPM_PUBLISH_KEY=$hash export PATH=$PATH:../bpm/src/:${GITHUB_WORKSPACE}/../cc65/bin if [ "$BRANCH_NAME" = "master" -o "$BRANCH_NAME" = "main" ]; then bpm --force-update -V;--force-update publish --official; else bpm publish --alpha; fi fi From 97265da2702631f8ee0d831b433081396f385ba2 Mon Sep 17 00:00:00 2001 From: jede Date: Mon, 28 Oct 2024 20:52:21 +0100 Subject: [PATCH 84/90] test --- .github/workflows/main.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2655ea7..9382b2d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -202,11 +202,13 @@ jobs: export BPM_PUBLISH_KEY=$hash export PATH=$PATH:../bpm/src/:${GITHUB_WORKSPACE}/../cc65/bin if [ "$BRANCH_NAME" = "master" -o "$BRANCH_NAME" = "main" ]; then bpm --force-update -V;--force-update publish --official; else bpm publish --alpha; fi - fi + echo "BPM_FOUND=True" >> $GITHUB_ENV + fi upload: needs: build runs-on: ubuntu-24.04 + if: env.BPM_FOUND != True defaults: run: shell: bash @@ -243,9 +245,9 @@ jobs: echo "Use tar for archive" tar -zcvf $GITHUB_WORKSPACE/$ARCHIVE_NAME * - - name: Upload to oric run: | + if BPM_FOUND=True" 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}" From 7ffae9b4fea8d31dfa7e396f16d466ff2d44b87a Mon Sep 17 00:00:00 2001 From: jede Date: Mon, 28 Oct 2024 20:54:26 +0100 Subject: [PATCH 85/90] fix --- .github/workflows/main.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9382b2d..0460a05 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -202,13 +202,12 @@ jobs: export BPM_PUBLISH_KEY=$hash export PATH=$PATH:../bpm/src/:${GITHUB_WORKSPACE}/../cc65/bin if [ "$BRANCH_NAME" = "master" -o "$BRANCH_NAME" = "main" ]; then bpm --force-update -V;--force-update publish --official; else bpm publish --alpha; fi - echo "BPM_FOUND=True" >> $GITHUB_ENV + echo "BPM_FOUND='True'" >> $GITHUB_ENV fi upload: needs: build runs-on: ubuntu-24.04 - if: env.BPM_FOUND != True defaults: run: shell: bash @@ -246,8 +245,8 @@ jobs: tar -zcvf $GITHUB_WORKSPACE/$ARCHIVE_NAME * - name: Upload to oric + if: env.BPM_FOUND != 'True' run: | - if BPM_FOUND=True" 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}" From 3b7f61a01328894cc410a694ac6e7b3ca9f34fa1 Mon Sep 17 00:00:00 2001 From: jede Date: Mon, 28 Oct 2024 21:07:57 +0100 Subject: [PATCH 86/90] fix --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0460a05..b05c894 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -203,7 +203,7 @@ jobs: export PATH=$PATH:../bpm/src/:${GITHUB_WORKSPACE}/../cc65/bin if [ "$BRANCH_NAME" = "master" -o "$BRANCH_NAME" = "main" ]; then bpm --force-update -V;--force-update publish --official; else bpm publish --alpha; fi echo "BPM_FOUND='True'" >> $GITHUB_ENV - fi + fi upload: needs: build From 1e46953cc90663f88b322b764486a67e39647dc3 Mon Sep 17 00:00:00 2001 From: jede Date: Mon, 28 Oct 2024 21:16:21 +0100 Subject: [PATCH 87/90] fix --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b05c894..230f77f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -245,8 +245,8 @@ jobs: tar -zcvf $GITHUB_WORKSPACE/$ARCHIVE_NAME * - name: Upload to oric - if: env.BPM_FOUND != 'True' run: | + echo BPM $BPM_FOUND # OK 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}" From b00e4bd6fc276793a8a4624728f2829df80b8e22 Mon Sep 17 00:00:00 2001 From: jede Date: Mon, 28 Oct 2024 21:35:57 +0100 Subject: [PATCH 88/90] fix test --- .github/workflows/main.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 230f77f..cd46691 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -104,6 +104,7 @@ jobs: outputs: version: ${{ steps.job_vars.outputs.VERSION }} repo_name: ${{ steps.job_vars.outputs.REPO_NAME }} + bpm_found: ${{ steps.bpm_upload.outputs.BPM_FOUND }} steps: - uses: actions/checkout@v3 @@ -197,12 +198,13 @@ jobs: run: mv ../cc65 . && mv ../orix-software . && mv ../orix-sdk . && mv ../md2hlp . - name: Upload if bpm + id: bpm_upload run: | if [ -f "bpm.tml" ]; then export BPM_PUBLISH_KEY=$hash export PATH=$PATH:../bpm/src/:${GITHUB_WORKSPACE}/../cc65/bin if [ "$BRANCH_NAME" = "master" -o "$BRANCH_NAME" = "main" ]; then bpm --force-update -V;--force-update publish --official; else bpm publish --alpha; fi - echo "BPM_FOUND='True'" >> $GITHUB_ENV + echo "BPM_FOUND='True'" >> $GITHUB_OUTPUT fi upload: @@ -215,6 +217,7 @@ jobs: hash: ${{ secrets.HASH }} version: ${{ needs.build.outputs.version }} repo_name: ${{ needs.build.outputs.repo_name }} + BPM_FOUND: ${{ needs.build.outputs.bpm_found }} steps: - name: Get branch name @@ -246,7 +249,7 @@ jobs: - name: Upload to oric run: | - echo BPM $BPM_FOUND # OK + echo BPM $BPM_FOUND 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}" From fe7878884f2b43535a66d6d9e69760bb838446fc Mon Sep 17 00:00:00 2001 From: jede Date: Mon, 28 Oct 2024 21:40:44 +0100 Subject: [PATCH 89/90] fix/Test --- .github/workflows/main.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cd46691..0bec73b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -250,6 +250,9 @@ jobs: - name: Upload to oric run: | echo BPM $BPM_FOUND - 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}" - + if [ "$BPM_FOUND" != "True" ]; then + 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}" + else + echo "Skipped, already sent with bpm" + fi From 4763bfc1aaf496b4eae8460ac5bac11e0719290e Mon Sep 17 00:00:00 2001 From: jede Date: Mon, 28 Oct 2024 21:42:34 +0100 Subject: [PATCH 90/90] fix --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0bec73b..046a98b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -204,7 +204,7 @@ jobs: export BPM_PUBLISH_KEY=$hash export PATH=$PATH:../bpm/src/:${GITHUB_WORKSPACE}/../cc65/bin if [ "$BRANCH_NAME" = "master" -o "$BRANCH_NAME" = "main" ]; then bpm --force-update -V;--force-update publish --official; else bpm publish --alpha; fi - echo "BPM_FOUND='True'" >> $GITHUB_OUTPUT + echo "BPM_FOUND=True" >> $GITHUB_OUTPUT fi upload: