Skip to content

Commit

Permalink
Ci 02 (#93)
Browse files Browse the repository at this point in the history
* CI: Use tagged version of watcom compiler

It seems the Watcom wlib command has changed its -l argument to require
a filename. Since the watcom build configuration is shared for DOS and
Linux cross compiler, use an older version to remain compatible with the
Watcom v1.9 packages in FreeDOS.

* CI: Update to use latest OS and actions.

Avoids deprecation warnings.
  • Loading branch information
andrewbird committed Apr 8, 2024
1 parent 8249cb9 commit d0798ad
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
build:
if: contains(github.event.head_commit.message, '[skip ci]') == false

runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Package install
run: |
Expand All @@ -42,7 +42,7 @@ jobs:
- name: upload
if: github.repository == 'FDOS/freecom' &&
(github.event_name == 'push' || github.event.pull_request.merged == true)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ steps.snapshotname.outputs.fname }}
path: _output
6 changes: 3 additions & 3 deletions ci_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ OWTAR=ow-snapshot.tar.xz
# Get Watcom compiler
if [ ! -d _watcom ] ; then
if [ ! -f $OWTAR ] ; then
echo "Downloading OpenWatcom compiler snaphot"
wget --no-verbose https://github.com/open-watcom/open-watcom-v2/releases/download/Current-build/$OWTAR
echo "Downloading OpenWatcom compiler"
wget --no-verbose https://github.com/open-watcom/open-watcom-v2/releases/download/2023-02-01-Build/$OWTAR
fi
echo "Extracting OpenWatcom compiler snaphot"
echo "Extracting OpenWatcom compiler"
mkdir _watcom
tar -C _watcom -xf $OWTAR
fi
Expand Down

0 comments on commit d0798ad

Please sign in to comment.