ich777/pcem
1
0
Fork 0
mirror of https://github.com/sarah-walker-pcem/pcem.git synced 2025-07-23 19:50:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Some fixes for the Github workflow actions (#264)

Browse Source
This commit is contained in:
Josep Maria Antolín Segura
2024-06-22 03:18:46 +02:00
committed by GitHub
parent c358285c8d
commit ce51cc197f
5 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/create-release.yml vendored
View File

@@ -67,7 +67,8 @@ jobs:
name: ${{ matrix.name }} name: ${{ matrix.name }}
steps: steps:
- uses: actions/checkout@v2 - name: "Check out repository"
uses: actions/checkout@v4.1.1
with: with:
path: temp path: temp
fetch-depth: 0 fetch-depth: 0
@@ -160,7 +161,7 @@ jobs:
cp ${{ matrix.artifacts_path }} $ARTIFACTSDIR cp ${{ matrix.artifacts_path }} $ARTIFACTSDIR
- name: "Upload GitHub Actions artifacts" - name: "Upload GitHub Actions artifacts"
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v4.3.1
with: with:
name: ${{ matrix.artifacts_name }} name: ${{ matrix.artifacts_name }}
path: ./artifacts path: ./artifacts

19
.github/workflows/test-debug-builds.yml vendored
View File

@@ -14,7 +14,7 @@ jobs:
include: include:
- name: Ubuntu 64bit (gcc) - name: Ubuntu 64bit (gcc)
os: ubuntu-latest os: ubuntu-latest
args: -DCMAKE_BUILD_TYPE=Debug -DPCEM_VERSION_STRING="vNext build ${GITHUB_SHA::8}" args: -DUSE_EXPERIMENTAL=ON -DUSE_EXPERIMENTAL_PRINTER=OFF -DUSE_EXPERIMENTAL_PGC=ON -DUSE_NETWORKING=OFF -DUSE_PCAP_NETWORKING=ON -DCMAKE_BUILD_TYPE=Debug -DPCEM_VERSION_STRING="vNext build ${GITHUB_SHA::8}"
artifacts_name: PCem-Debug-vNext-Ubuntu-${{ github.run_number }} artifacts_name: PCem-Debug-vNext-Ubuntu-${{ github.run_number }}
artifacts_path: PCem-Debug-vNext-Ubuntu-${{ github.run_number }}-${{ github.sha }}.tar.bz2 artifacts_path: PCem-Debug-vNext-Ubuntu-${{ github.run_number }}-${{ github.sha }}.tar.bz2
installdeps: >- installdeps: >-
@@ -27,7 +27,7 @@ jobs:
- name: Windows 32bits (MSYS2) - name: Windows 32bits (MSYS2)
os: windows-latest os: windows-latest
compiler: MINGW32 compiler: MINGW32
args: -DCMAKE_BUILD_TYPE=Debug -DPCEM_VERSION_STRING="vNext build ${GITHUB_SHA::8}" args: -DUSE_EXPERIMENTAL=ON -DUSE_EXPERIMENTAL_PRINTER=OFF -DUSE_EXPERIMENTAL_PGC=ON -DUSE_NETWORKING=OFF -DUSE_PCAP_NETWORKING=OFF -DCMAKE_BUILD_TYPE=Debug -DPCEM_VERSION_STRING="vNext build ${GITHUB_SHA::8}"
artifacts_name: PCem-Debug-vNext-Windows-MINGW32-${{ github.run_number }} artifacts_name: PCem-Debug-vNext-Windows-MINGW32-${{ github.run_number }}
artifacts_path: PCem-Debug-vNext-Windows-MINGW32-${{ github.run_number }}-${{ github.sha }}.zip artifacts_path: PCem-Debug-vNext-Windows-MINGW32-${{ github.run_number }}-${{ github.sha }}.zip
installdeps: >- installdeps: >-
@@ -38,14 +38,13 @@ jobs:
mingw-w64-i686-toolchain mingw-w64-i686-toolchain
mingw-w64-i686-SDL2 mingw-w64-i686-SDL2
mingw-w64-i686-openal mingw-w64-i686-openal
mingw-w64-i686-wxWidgets mingw-w64-i686-wxwidgets3.2-msw
mingw-w64-i686-cmake mingw-w64-i686-cmake
mingw-w64-i686-libpcap
mingw-w64-i686-ninja mingw-w64-i686-ninja
- name: Windows 64bits (MSYS2) - name: Windows 64bits (MSYS2)
os: windows-latest os: windows-latest
compiler: MINGW64 compiler: MINGW64
args: -DCMAKE_BUILD_TYPE=Debug -DPCEM_VERSION_STRING="vNext build ${GITHUB_SHA::8}" args: -DUSE_EXPERIMENTAL=ON -DUSE_EXPERIMENTAL_PRINTER=OFF -DUSE_EXPERIMENTAL_PGC=ON -DUSE_NETWORKING=OFF -DUSE_PCAP_NETWORKING=ON -DCMAKE_BUILD_TYPE=Debug -DPCEM_VERSION_STRING="vNext build ${GITHUB_SHA::8}"
artifacts_name: PCem-Debug-vNext-Windows-MINGW64-${{ github.run_number }} artifacts_name: PCem-Debug-vNext-Windows-MINGW64-${{ github.run_number }}
artifacts_path: PCem-Debug-vNext-Windows-MINGW64-${{ github.run_number }}-${{ github.sha }}.zip artifacts_path: PCem-Debug-vNext-Windows-MINGW64-${{ github.run_number }}-${{ github.sha }}.zip
installdeps: >- installdeps: >-
@@ -56,7 +55,7 @@ jobs:
mingw-w64-x86_64-toolchain mingw-w64-x86_64-toolchain
mingw-w64-x86_64-SDL2 mingw-w64-x86_64-SDL2
mingw-w64-x86_64-openal mingw-w64-x86_64-openal
mingw-w64-x86_64-wxWidgets mingw-w64-x86_64-wxwidgets3.2-msw
mingw-w64-x86_64-cmake mingw-w64-x86_64-cmake
mingw-w64-x86_64-libpcap mingw-w64-x86_64-libpcap
mingw-w64-x86_64-ninja mingw-w64-x86_64-ninja
@@ -64,7 +63,8 @@ jobs:
name: ${{ matrix.name }} name: ${{ matrix.name }}
steps: steps:
- uses: actions/checkout@v2 - name: "Check out repository"
uses: actions/checkout@v4.1.1
with: with:
path: temp path: temp
fetch-depth: 0 fetch-depth: 0
@@ -157,13 +157,16 @@ jobs:
cp ${{ matrix.artifacts_path }} $ARTIFACTSDIR cp ${{ matrix.artifacts_path }} $ARTIFACTSDIR
- name: 'Upload GitHub Actions artifacts' - name: 'Upload GitHub Actions artifacts'
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v4.3.1
with: with:
name: ${{ matrix.artifacts_name }} name: ${{ matrix.artifacts_name }}
path: ./artifacts path: ./artifacts
- name: Upload to NasuTek MinIO S3 - name: Upload to NasuTek MinIO S3
uses: shallwefootball/s3-upload-action@master uses: shallwefootball/s3-upload-action@master
env:
super_secret: ${{secrets.nte_cdn_s3_key_id}}
if: ${{ env.super_secret != null }}
id: S3 id: S3
with: with:
aws_key_id: ${{secrets.nte_cdn_s3_key_id}} aws_key_id: ${{secrets.nte_cdn_s3_key_id}}

19
.github/workflows/test-release-builds.yml vendored
View File

@@ -14,7 +14,7 @@ jobs:
include: include:
- name: Ubuntu 64bit (gcc) - name: Ubuntu 64bit (gcc)
os: ubuntu-latest os: ubuntu-latest
args: -DCMAKE_BUILD_TYPE=Release -DPCEM_VERSION_STRING="vNext build ${GITHUB_SHA::8}" args: -DUSE_EXPERIMENTAL=ON -DUSE_EXPERIMENTAL_PRINTER=OFF -DUSE_EXPERIMENTAL_PGC=ON -DUSE_NETWORKING=OFF -DUSE_PCAP_NETWORKING=ON -DCMAKE_BUILD_TYPE=Release -DPCEM_VERSION_STRING="vNext build ${GITHUB_SHA::8}"
artifacts_name: PCem-vNext-Ubuntu-${{ github.run_number }} artifacts_name: PCem-vNext-Ubuntu-${{ github.run_number }}
artifacts_path: PCem-vNext-Ubuntu-${{ github.run_number }}-${{ github.sha }}.tar.bz2 artifacts_path: PCem-vNext-Ubuntu-${{ github.run_number }}-${{ github.sha }}.tar.bz2
installdeps: >- installdeps: >-
@@ -27,7 +27,7 @@ jobs:
- name: Windows 32bits (MSYS2) - name: Windows 32bits (MSYS2)
os: windows-latest os: windows-latest
compiler: MINGW32 compiler: MINGW32
args: -DCMAKE_BUILD_TYPE=Release -DPCEM_VERSION_STRING="vNext build ${GITHUB_SHA::8}" args: -DUSE_EXPERIMENTAL=ON -DUSE_EXPERIMENTAL_PRINTER=OFF -DUSE_EXPERIMENTAL_PGC=ON -DUSE_NETWORKING=OFF -DUSE_PCAP_NETWORKING=OFF -DCMAKE_BUILD_TYPE=Release -DPCEM_VERSION_STRING="vNext build ${GITHUB_SHA::8}"
artifacts_name: PCem-vNext-Windows-MINGW32-${{ github.run_number }} artifacts_name: PCem-vNext-Windows-MINGW32-${{ github.run_number }}
artifacts_path: PCem-vNext-Windows-MINGW32-${{ github.run_number }}-${{ github.sha }}.zip artifacts_path: PCem-vNext-Windows-MINGW32-${{ github.run_number }}-${{ github.sha }}.zip
installdeps: >- installdeps: >-
@@ -38,14 +38,13 @@ jobs:
mingw-w64-i686-toolchain mingw-w64-i686-toolchain
mingw-w64-i686-SDL2 mingw-w64-i686-SDL2
mingw-w64-i686-openal mingw-w64-i686-openal
mingw-w64-i686-wxWidgets mingw-w64-i686-wxwidgets3.2-msw
mingw-w64-i686-cmake mingw-w64-i686-cmake
mingw-w64-i686-libpcap
mingw-w64-i686-ninja mingw-w64-i686-ninja
- name: Windows 64bits (MSYS2) - name: Windows 64bits (MSYS2)
os: windows-latest os: windows-latest
compiler: MINGW64 compiler: MINGW64
args: -DCMAKE_BUILD_TYPE=Release -DPCEM_VERSION_STRING="vNext build ${GITHUB_SHA::8}" args: -DUSE_EXPERIMENTAL=ON -DUSE_EXPERIMENTAL_PRINTER=OFF -DUSE_EXPERIMENTAL_PGC=ON -DUSE_NETWORKING=OFF -DUSE_PCAP_NETWORKING=ON -DCMAKE_BUILD_TYPE=Release -DPCEM_VERSION_STRING="vNext build ${GITHUB_SHA::8}"
artifacts_name: PCem-vNext-Windows-MINGW64-${{ github.run_number }} artifacts_name: PCem-vNext-Windows-MINGW64-${{ github.run_number }}
artifacts_path: PCem-vNext-Windows-MINGW64-${{ github.run_number }}-${{ github.sha }}.zip artifacts_path: PCem-vNext-Windows-MINGW64-${{ github.run_number }}-${{ github.sha }}.zip
installdeps: >- installdeps: >-
@@ -56,7 +55,7 @@ jobs:
mingw-w64-x86_64-toolchain mingw-w64-x86_64-toolchain
mingw-w64-x86_64-SDL2 mingw-w64-x86_64-SDL2
mingw-w64-x86_64-openal mingw-w64-x86_64-openal
mingw-w64-x86_64-wxWidgets mingw-w64-x86_64-wxwidgets3.2-msw
mingw-w64-x86_64-cmake mingw-w64-x86_64-cmake
mingw-w64-x86_64-libpcap mingw-w64-x86_64-libpcap
mingw-w64-x86_64-ninja mingw-w64-x86_64-ninja
@@ -64,7 +63,8 @@ jobs:
name: ${{ matrix.name }} name: ${{ matrix.name }}
steps: steps:
- uses: actions/checkout@v2 - name: "Check out repository"
uses: actions/checkout@v4.1.1
with: with:
path: temp path: temp
fetch-depth: 0 fetch-depth: 0
@@ -157,13 +157,16 @@ jobs:
cp ${{ matrix.artifacts_path }} $ARTIFACTSDIR cp ${{ matrix.artifacts_path }} $ARTIFACTSDIR
- name: 'Upload GitHub Actions artifacts' - name: 'Upload GitHub Actions artifacts'
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v4.3.1
with: with:
name: ${{ matrix.artifacts_name }} name: ${{ matrix.artifacts_name }}
path: ./artifacts path: ./artifacts
- name: Upload to NasuTek MinIO S3 - name: Upload to NasuTek MinIO S3
uses: shallwefootball/s3-upload-action@master uses: shallwefootball/s3-upload-action@master
env:
super_secret: ${{secrets.nte_cdn_s3_key_id}}
if: ${{ env.super_secret != null }}
id: S3 id: S3
with: with:
aws_key_id: ${{secrets.nte_cdn_s3_key_id}} aws_key_id: ${{secrets.nte_cdn_s3_key_id}}

19
.github/workflows/test-relwithdebinfo-builds.yml vendored
View File

@@ -14,7 +14,7 @@ jobs:
include: include:
- name: Ubuntu 64bit (gcc) - name: Ubuntu 64bit (gcc)
os: ubuntu-latest os: ubuntu-latest
args: -DCMAKE_BUILD_TYPE=RelWithDebInfo -DPCEM_RELDEB_AS_RELEASE=OFF -DPCEM_VERSION_STRING="vNext build ${GITHUB_SHA::8}" args: -DUSE_EXPERIMENTAL=ON -DUSE_EXPERIMENTAL_PRINTER=OFF -DUSE_EXPERIMENTAL_PGC=ON -DUSE_NETWORKING=OFF -DUSE_PCAP_NETWORKING=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DPCEM_RELDEB_AS_RELEASE=OFF -DPCEM_VERSION_STRING="vNext build ${GITHUB_SHA::8}"
artifacts_name: PCem-RelWithDebInfo-vNext-Ubuntu-${{ github.run_number }} artifacts_name: PCem-RelWithDebInfo-vNext-Ubuntu-${{ github.run_number }}
artifacts_path: PCem-RelWithDebInfo-vNext-Ubuntu-${{ github.run_number }}-${{ github.sha }}.tar.bz2 artifacts_path: PCem-RelWithDebInfo-vNext-Ubuntu-${{ github.run_number }}-${{ github.sha }}.tar.bz2
installdeps: >- installdeps: >-
@@ -27,7 +27,7 @@ jobs:
- name: Windows 32bits (MSYS2) - name: Windows 32bits (MSYS2)
os: windows-latest os: windows-latest
compiler: MINGW32 compiler: MINGW32
args: -DCMAKE_BUILD_TYPE=RelWithDebInfo -DPCEM_RELDEB_AS_RELEASE=OFF -DPCEM_VERSION_STRING="vNext build ${GITHUB_SHA::8}" args: -DUSE_EXPERIMENTAL=ON -DUSE_EXPERIMENTAL_PRINTER=OFF -DUSE_EXPERIMENTAL_PGC=ON -DUSE_NETWORKING=OFF -DUSE_PCAP_NETWORKING=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DPCEM_RELDEB_AS_RELEASE=OFF -DPCEM_VERSION_STRING="vNext build ${GITHUB_SHA::8}"
artifacts_name: PCem-RelWithDebInfo-vNext-Windows-MINGW32-${{ github.run_number }} artifacts_name: PCem-RelWithDebInfo-vNext-Windows-MINGW32-${{ github.run_number }}
artifacts_path: PCem-RelWithDebInfo-vNext-Windows-MINGW32-${{ github.run_number }}-${{ github.sha }}.zip artifacts_path: PCem-RelWithDebInfo-vNext-Windows-MINGW32-${{ github.run_number }}-${{ github.sha }}.zip
installdeps: >- installdeps: >-
@@ -38,14 +38,13 @@ jobs:
mingw-w64-i686-toolchain mingw-w64-i686-toolchain
mingw-w64-i686-SDL2 mingw-w64-i686-SDL2
mingw-w64-i686-openal mingw-w64-i686-openal
mingw-w64-i686-wxWidgets mingw-w64-i686-wxwidgets3.2-msw
mingw-w64-i686-cmake mingw-w64-i686-cmake
mingw-w64-i686-libpcap
mingw-w64-i686-ninja mingw-w64-i686-ninja
- name: Windows 64bits (MSYS2) - name: Windows 64bits (MSYS2)
os: windows-latest os: windows-latest
compiler: MINGW64 compiler: MINGW64
args: -DCMAKE_BUILD_TYPE=RelWithDebInfo -DPCEM_RELDEB_AS_RELEASE=OFF -DPCEM_VERSION_STRING="vNext build ${GITHUB_SHA::8}" args: -DUSE_EXPERIMENTAL=ON -DUSE_EXPERIMENTAL_PRINTER=OFF -DUSE_EXPERIMENTAL_PGC=ON -DUSE_NETWORKING=OFF -DUSE_PCAP_NETWORKING=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DPCEM_RELDEB_AS_RELEASE=OFF -DPCEM_VERSION_STRING="vNext build ${GITHUB_SHA::8}"
artifacts_name: PCem-RelWithDebInfo-vNext-Windows-MINGW64-${{ github.run_number }} artifacts_name: PCem-RelWithDebInfo-vNext-Windows-MINGW64-${{ github.run_number }}
artifacts_path: PCem-RelWithDebInfo-vNext-Windows-MINGW64-${{ github.run_number }}-${{ github.sha }}.zip artifacts_path: PCem-RelWithDebInfo-vNext-Windows-MINGW64-${{ github.run_number }}-${{ github.sha }}.zip
installdeps: >- installdeps: >-
@@ -56,7 +55,7 @@ jobs:
mingw-w64-x86_64-toolchain mingw-w64-x86_64-toolchain
mingw-w64-x86_64-SDL2 mingw-w64-x86_64-SDL2
mingw-w64-x86_64-openal mingw-w64-x86_64-openal
mingw-w64-x86_64-wxWidgets mingw-w64-x86_64-wxwidgets3.2-msw
mingw-w64-x86_64-cmake mingw-w64-x86_64-cmake
mingw-w64-x86_64-libpcap mingw-w64-x86_64-libpcap
mingw-w64-x86_64-ninja mingw-w64-x86_64-ninja
@@ -64,7 +63,8 @@ jobs:
name: ${{ matrix.name }} name: ${{ matrix.name }}
steps: steps:
- uses: actions/checkout@v2 - name: "Check out repository"
uses: actions/checkout@v4.1.1
with: with:
path: temp path: temp
fetch-depth: 0 fetch-depth: 0
@@ -157,13 +157,16 @@ jobs:
cp ${{ matrix.artifacts_path }} $ARTIFACTSDIR cp ${{ matrix.artifacts_path }} $ARTIFACTSDIR
- name: 'Upload GitHub Actions artifacts' - name: 'Upload GitHub Actions artifacts'
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v4.3.1
with: with:
name: ${{ matrix.artifacts_name }} name: ${{ matrix.artifacts_name }}
path: ./artifacts path: ./artifacts
- name: Upload to NasuTek MinIO S3 - name: Upload to NasuTek MinIO S3
uses: shallwefootball/s3-upload-action@master uses: shallwefootball/s3-upload-action@master
env:
super_secret: ${{secrets.nte_cdn_s3_key_id}}
if: ${{ env.super_secret != null }}
id: S3 id: S3
with: with:
aws_key_id: ${{secrets.nte_cdn_s3_key_id}} aws_key_id: ${{secrets.nte_cdn_s3_key_id}}

3
src/cpu/808x.c
View File

@@ -9,7 +9,10 @@
4 clocks - fetch mod/rm 4 clocks - fetch mod/rm
2 clocks - fetch opcode 1 2 clocks - execute 2 clocks - fetch opcode 1 2 clocks - execute
2 clocks - fetch opcode 2 etc*/ 2 clocks - fetch opcode 2 etc*/
#if defined(__linux__) || defined(__APPLE__)
#include <unistd.h> #include <unistd.h>
#endif
#include <stdio.h> #include <stdio.h>
#include "ibm.h" #include "ibm.h"