Merge pull request #2 from orix-software/develop

Develop

.github/workflows/main.yml

@@ -0,0 +1,174 @@
+name: build
+
+# Controls when the action will run.
+on:
+  # Triggers the workflow on push event only for all branches
+  push:
+    branches: [ main, master, develop ]
+  #pull_request:
+  #  branches: [ main, master ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  # This workflow contains a single job called "build"
+  setup-sdk:
+    runs-on: ubuntu-18.04
+
+    steps:
+      - name: Cache sdk
+        id: cache-sdk
+        uses: actions/cache@v2
+        with:
+          path: |
+             cc65/**/*
+             orix-sdk/**/*
+             md2hlp/**/*
+             orix-software/**/*
+          key: ${{ secrets.CACHE_ID }}-orix-sdk_
+
+      - name: Checkout cc65
+        if: steps.cache-sdk.outputs.cache-hit != 'true'
+        uses: actions/checkout@v2
+        with:
+          repository: cc65/cc65
+          path: cc65
+
+      - name: Checkout orix-sdk
+        if: steps.cache-sdk.outputs.cache-hit != 'true'
+        uses: actions/checkout@v2
+        with:
+          repository: assinie/orix-sdk
+          path: orix-sdk
+
+      - name: Checkout md2hlp
+        if: steps.cache-sdk.outputs.cache-hit != 'true'
+        uses: actions/checkout@v2
+        with:
+          repository: assinie/md2hlp
+          path: md2hlp
+
+      - name: Compilation CC65
+        if: steps.cache-sdk.outputs.cache-hit != 'true'
+        run: make -C cc65 >/dev/null
+
+      - name: Prepare environment for orix-sdk
+        if: steps.cache-sdk.outputs.cache-hit != 'true'
+        run: |
+          git clone --no-checkout --depth 1 --single-branch --branch master https://github.com/orix-software/shell orix-software/shell
+          cd orix-software/shell
+          git config --local core.sparseCheckout true
+          echo "src/include" >> .git/info/sparse-checkout
+          git checkout
+          cd ../..
+          git clone --no-checkout --depth 1 --single-branch --branch master https://github.com/orix-software/kernel orix-software/kernel
+          cd orix-software/kernel
+          git config --local core.sparseCheckout true
+          echo "src/include" >> .git/info/sparse-checkout
+          git checkout
+
+      - name: Compile orix-sdk
+        if: steps.cache-sdk.outputs.cache-hit != 'true'
+        working-directory: orix-sdk
+        run: mkdir -p build/{lib,bin} && CC65_HOME=${GITHUB_WORKSPACE}/cc65 make lib
+
+      - name: Display tools
+        run: |
+          PATH=$PATH:${GITHUB_WORKSPACE}/cc65/bin
+          cc65 -V
+          ls -lR orix-sdk
+          ls -l cc65/bin
+
+  build:
+    # The type of runner that the job will run on
+    needs: setup-sdk
+    runs-on: ubuntu-18.04
+    outputs:
+      version: ${{ steps.job_vars.outputs.VERSION }}
+      repo_name: ${{ steps.job_vars.outputs.REPO_NAME }}
+
+    steps:
+      - name: Checkout repository and submodules
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+
+      - name: Set job variables
+        id: job_vars
+        run: |
+          echo "::set-output name=VERSION::$(cat VERSION)"
+          echo "::set-output name=REPO_NAME::${GITHUB_REPOSITORY##*/}"
+
+      - name: Install sdk
+        uses: actions/cache@v2
+        with:
+          path: |
+             cc65/**/*
+             orix-sdk/**/*
+             md2hlp/**/*
+             orix-software/**/*
+          key: ${{ secrets.CACHE_ID }}-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
+
+      - name: List build directory content
+        run: ls -lR build
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ steps.job_vars.outputs.REPO_NAME }}
+          path: |
+            build/**/*
+            !build/obj/*
+
+      - name: Post compilation
+        run: mv ../cc65 . && mv ../orix-software . && mv ../orix-sdk . && mv ../md2hlp .
+
+  upload:
+    needs: build
+    runs-on: ubuntu-18.04
+    defaults:
+      run:
+        shell: bash
+    env:
+      hash: ${{ secrets.HASH }}
+      version: ${{ needs.build.outputs.version }}
+      repo_name: ${{ needs.build.outputs.repo_name }}
+
+    steps:
+      - name: Get branch name
+        if: github.event_name != 'pull_request'
+        run: echo "BRANCH_NAME=${GITHUB_REF##*/}" >> $GITHUB_ENV
+       # run: echo "::set-env name=BRANCH_NAME::$(echo ${GITHUB_REF##*/})"
+
+      - name: Get branch name on pull request
+        if: github.event_name == 'pull_request'
+        run: echo "BRANCH_NAME=${GITHUB_HEAD_REF}" >> GITHUB_ENV
+       #run: echo "::set-env name=BRANCH_NAME::$(echo ${GITHUB_HEAD_REF})"
+
+      - name: Get archive name
+        run: echo "ARCHIVE_NAME=${repo_name}.tgz" >> $GITHUB_ENV
+
+      # On pourrait faire l'extraction directement à la racine si VERSION est dans l'artifact
+      - name: Download Artifact
+        id: download
+        uses: actions/download-artifact@v2
+        with:
+          name: ${{ needs.build.outputs.repo_name }}
+          path: artifact
+
+      - name: Make archive
+        working-directory: ${{steps.download.outputs.download-path}}
+        run: tar -zcvf $GITHUB_WORKSPACE/$ARCHIVE_NAME *
+
+      - 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}"
+

Makefile

@@ -1,39 +1,24 @@
 CC=cl65
 CFLAGS=-ttelestrat
 PROGRAM=gunzip
-HOMEDIR=/home/travis/bin/
-HOMEDIR_PROGRAM=/home/travis/build/orix-software/$(PROGRAM)
 
 SOURCE=src/$(PROGRAM).c
 LDFILES=
 
-ifdef TRAVIS_BRANCH
-ifeq ($(TRAVIS_BRANCH), master)
-RELEASE:=$(shell cat VERSION)
+ifeq ($(CC65_HOME),)
+        CC = cl65
+        AS = ca65
+        LD = ld65
+        AR = ar65
 else
-RELEASE=alpha
+        CC = $(CC65_HOME)/bin/cl65
+        AS = $(CC65_HOME)/bin/ca65
+        LD = $(CC65_HOME)/bin/ld65
+        AR = $(CC65_HOME)/bin/ar65
 endif
-endif
-
-
-ASFLAGS=-C -W -e error.txt -l xa_labels.txt -DTARGET_ORIX
 
 $(PROGRAM): $(SOURCE)
 	$(CC) -o $(PROGRAM) $(CFLAGS) $(LDFILES) $(SOURCE)
+	mkdir build/bin -p && mv gunzip build/bin
+	mkdir build/usr/share/man -p && cp src/man/gunzip.hlp build/usr/share/man
 
-
-test:
-	mkdir -p build/bin/
-	mkdir -p build/usr/share/man
-	mkdir -p build/usr/share/ipkg  
-	mkdir -p build/usr/share/doc/$(PROGRAM)/
-	cp $(PROGRAM) build/bin/
-	cd $(HOMEDIR) && cat $(HOMEDIR_PROGRAM)/src/man/$(PROGRAM).md | md2hlp.py > $(HOMEDIR_PROGRAM)/build/usr/share/man/$(PROGRAM).hlp  
-	cp README.md build/usr/share/doc/$(PROGRAM)/
-	cp src/ipkg/$(PROGRAM).csv build/usr/share/ipkg
-	cd build &&	tar -c * > ../$(PROGRAM).tar &&	cd ..  
-	filepack  $(PROGRAM).tar $(PROGRAM).pkg
-	gzip $(PROGRAM).tar
-	mv $(PROGRAM).tar.gz $(PROGRAM).tgz
-	php buildTestAndRelease/publish/publish2repo.php $(PROGRAM).tgz ${hash} 6502 tgz $(RELEASE)
-	echo nothing

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/oric-software/gunzip.svg?branch=master)](https://travis-ci.org/oric-software/gunzip)
+# gunzip
 
-#gunzip
+[![Build Status](https://travis-ci.org/orix-software/gunzip.svg?branch=master)](https://travis-ci.org/orix-software/gunzip)
 

VERSION

@@ -1 +1 @@
-2020.3
+2022.3

src/gunzip.c

@@ -195,7 +195,7 @@ char* get_fname(void)
 
 void version()
 {
-  printf("gunpack %s\n",VERSION);
+  printf("gunzip %s\n",VERSION);
 }
 
 void usage()

src/version.h

@@ -1 +1 @@
-#define VERSION "2020.3" 
+#define VERSION "2022.3"