Update makefile.yml

dmcoles · Sep 12, 2023 · d918690 · d918690
1 parent 8294f21
commit d918690
Showing 1 changed file with 30 additions and 18 deletions.
diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml
@@ -3,27 +3,39 @@ name: Makefile CI
 on:
   workflow_dispatch:
   push:
-    branches: [ "actionstest" ]
+    branches: [ "v5.6.0" ]
   pull_request:
-    branches: [ "actionstest" ]
+    branches: [ "v5.6.0" ]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
+    container:
+      image: dmcoles/amiga-evo-cicd
+      credentials:
+            username: ${{ secrets.DOCKER_USERNAME }}
+            password: ${{ secrets.DOCKER_PASSWORD }}
+    steps: 
+      - uses: actions/checkout@v4
+      - name: run build
+        run: |
+           vamos -c /usr/amiga/.vamosrc --cwd esource: -V system:/usr/amiga -V esource:$GITHUB_WORKSPACE make
+           vamos -c /usr/amiga/.vamosrc --cwd esource:axSetupTool -V system:/usr/amiga -V esource:$GITHUB_WORKSPACE make
 
-    steps:
-    - uses: actions/checkout@v3
-
-    - uses: addnab/docker-run-action@v3
-      with:
-         username: ${{ secrets.DOCKER_USERNAME }}
-         password: ${{ secrets.DOCKER_PASSWORD }}
-         registry: docker.io
-         image: dmcoles/amiga-evo-cicd:latest
-         options: -v $ {{ github.workspace }}:~/source
-         run: |
-           echo "hello world"
-           vamos --cwd esource:AmiExpress make
-           vamos --cwd esource:AmiExpress/axSetupTool make
-           
+      - name: add build artifacts to publish
+        run: |
+          mkdir downloads
+          mkdir downloads/utils
+          cp $GITHUB_WORKSPACE/express5 downloads
+          cp $GITHUB_WORKSPACE/acp downloads
+          cp $GITHUB_WORKSPACE/jsonimport downloads/utils
+          cp $GITHUB_WORKSPACE/icon2cfg downloads/utils
+          cp $GITHUB_WORKSPACE/qwk downloads/utils
+          cp $GITHUB_WORKSPACE/ftn downloads/utils
+          cp $GITHUB_WORKSPACE/axSetupTool/axSetupTool downloads/utils
+    
+      - name: Use the Upload Artifact GitHub Action
+        uses: actions/upload-artifact@v2
+        with: 
+          name: amiExpress-nightly${{ github.sha }}
+          path: downloads