Skip to content

Commit

Permalink
Merge branch 'master' into automap
Browse files Browse the repository at this point in the history
  • Loading branch information
@athas
athas committed Nov 4, 2024
2 parents 5818c5f + 86cf19a commit 279de4a
Show file tree
Hide file tree
Showing 85 changed files with 2,765 additions and 910 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/benchmark.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-22.04

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

- name: Install Nix
uses: cachix/install-nix-action@v27
Expand All @@ -40,7 +40,7 @@ jobs:
env:
TMPDIR: "/scratch"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
fetch-depth: 0
Expand All @@ -56,7 +56,7 @@ jobs:
env:
TMPDIR: "/scratch"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
fetch-depth: 0
Expand All @@ -70,7 +70,7 @@ jobs:
needs: [build-linux-nix]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
fetch-depth: 0
Expand All @@ -90,7 +90,7 @@ jobs:
# needs: [build-linux-nix]

# steps:
# - uses: actions/checkout@v3
# - uses: actions/checkout@v4
# with:
# submodules: recursive
# fetch-depth: 0
Expand All @@ -106,7 +106,7 @@ jobs:
# needs: [build-linux-nix]

# steps:
# - uses: actions/checkout@v3
# - uses: actions/checkout@v4
# with:
# submodules: recursive
# fetch-depth: 0
Expand All @@ -122,7 +122,7 @@ jobs:
needs: [build-linux-nix]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
fetch-depth: 0
Expand All @@ -137,7 +137,7 @@ jobs:
needs: [build-linux-nix]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
fetch-depth: 0
Expand Down
85 changes: 54 additions & 31 deletions .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-22.04

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

- name: Install Nix
uses: cachix/install-nix-action@v27
Expand All @@ -33,7 +33,7 @@ jobs:
runs-on: ubuntu-22.04

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

- name: Workaround runner image issue
# https://github.com/actions/runner-images/issues/7061
Expand All @@ -43,7 +43,7 @@ jobs:
with:
ghc-version: '9.8.1'

- uses: actions/cache@v3
- uses: actions/cache@v4
name: Cache ~/.cabal/packages, ~/.cabal/store and dist-newstyle
with:
path: |
Expand All @@ -64,15 +64,15 @@ jobs:
runs-on: macos-latest

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

- name: Install dependencies
run: |
brew install cabal-install ghc sphinx-doc
echo "/opt/homebrew/opt/sphinx-doc/bin" >> $GITHUB_PATH
echo "/opt/homebrew/opt/ghc/bin" >> $GITHUB_PATH
- uses: actions/cache@v3
- uses: actions/cache@v4
name: Cache ~/.cabal/packages, ~/.cabal/store and dist-newstyle
with:
path: |
Expand Down Expand Up @@ -106,14 +106,14 @@ jobs:
runs-on: windows-latest

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

- id: setup-haskell
uses: haskell-actions/setup@v2
with:
ghc-version: '9.8.1'

- uses: actions/cache@v3
- uses: actions/cache@v4
name: Cache cabal stuff
with:
path: |
Expand All @@ -127,7 +127,7 @@ jobs:
cabal update
try() { cabal install --install-method=copy --overwrite-policy=always --installdir=.; }
try || try || try
- uses: papeloto/action-zip@v1.1
- uses: vimtor/action-zip@v1.2
with:
files: futhark.exe
dest: futhark-nightly-windows-x86_64.zip
Expand All @@ -142,12 +142,12 @@ jobs:
runs-on: ubuntu-22.04

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

- name: Install Nix
uses: cachix/install-nix-action@v27

- uses: actions/cache@v3
- uses: actions/cache@v4
name: Cache ~/.cabal/packages, ~/.cabal/store and dist-newstyle
with:
path: |
Expand All @@ -164,7 +164,7 @@ jobs:
runs-on: ubuntu-22.04

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

- name: Install Nix
uses: cachix/install-nix-action@v27
Expand All @@ -181,12 +181,12 @@ jobs:
# runs-on: ubuntu-22.04

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

# - name: Install Nix
# uses: cachix/install-nix-action@v18

# - uses: actions/cache@v3
# - uses: actions/cache@v4
# name: Cache ~/.cabal/packages, ~/.cabal/store and dist-newstyle
# with:
# path: |
Expand All @@ -205,7 +205,7 @@ jobs:
needs: [build-linux-nix]

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

- uses: actions/download-artifact@v4
with:
Expand All @@ -224,7 +224,7 @@ jobs:
needs: [build-linux-nix]

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

- uses: actions/download-artifact@v4
with:
Expand All @@ -243,7 +243,7 @@ jobs:
needs: [build-linux-nix]

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

- name: Install dependencies
run: |
Expand All @@ -268,7 +268,7 @@ jobs:
needs: [build-linux-nix]

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

- name: Install dependencies
run: |
Expand All @@ -293,7 +293,7 @@ jobs:
needs: [build-linux-nix]

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

- name: Install dependencies
run: |
Expand Down Expand Up @@ -323,7 +323,7 @@ jobs:
needs: [build-linux-nix]

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

- name: Install dependencies
run: |
Expand All @@ -348,7 +348,7 @@ jobs:
runs-on: ubuntu-22.04
needs: [build-linux-nix]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install dependencies
run: |
sudo apt-get update
Expand All @@ -368,7 +368,7 @@ jobs:
runs-on: ubuntu-22.04
needs: [build-linux-nix]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install dependencies
run: |
sudo apt-get update
Expand All @@ -393,7 +393,7 @@ jobs:
needs: [build-linux-nix]
if: github.repository == 'diku-dk/futhark'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: ./.github/actions/futhark-slurm
with:
Expand All @@ -415,7 +415,7 @@ jobs:
needs: [build-linux-nix]
if: github.repository == 'diku-dk/futhark'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: ./.github/actions/futhark-slurm
with:
Expand All @@ -434,7 +434,7 @@ jobs:
needs: [build-linux-nix]
if: github.repository == 'diku-dk/futhark'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: ./.github/actions/futhark-slurm
with:
Expand All @@ -458,7 +458,7 @@ jobs:
needs: [build-linux-nix]
if: github.repository == 'diku-dk/futhark'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- run: |
python -m venv virtualenv
Expand All @@ -478,7 +478,7 @@ jobs:
needs: [build-linux-nix]

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

- uses: mymindstorm/setup-emsdk@v12
with:
Expand Down Expand Up @@ -515,7 +515,7 @@ jobs:
needs: [build-linux-nix]

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

- uses: mymindstorm/setup-emsdk@v12
with:
Expand Down Expand Up @@ -547,7 +547,7 @@ jobs:
needs: [build-linux-nix]

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

- uses: mymindstorm/setup-emsdk@v12
with:
Expand Down Expand Up @@ -577,7 +577,7 @@ jobs:
needs: [build-linux-nix]

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

- uses: actions/download-artifact@v4
with:
Expand All @@ -592,6 +592,26 @@ jobs:
- run: |
tools/testparser.sh tests
test-formatter:
runs-on: ubuntu-22.04
needs: [build-linux-nix]

steps:
- uses: actions/checkout@v4

- uses: actions/download-artifact@v4
with:
name: futhark-nightly-linux-x86_64.tar.xz

- name: Install from nightly tarball
run: |
tar xvf futhark-nightly-linux-x86_64.tar.xz
make -C futhark-nightly-linux-x86_64/ install PREFIX=$HOME/.local
echo "$HOME/.local/bin" >> $GITHUB_PATH
- run: |
tools/testfmt.sh tests
test-tools:
runs-on: ubuntu-22.04
needs: [build-linux-nix]
Expand All @@ -602,7 +622,7 @@ jobs:
sudo apt-get update
sudo apt-get install -y ffmpeg oclgrind
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/download-artifact@v4
with:
Expand All @@ -629,6 +649,9 @@ jobs:
- run: |
cd tests_adhoc && sh test.sh
- run: |
cd tests_fmt && sh test.sh
- run: |
futhark doc -o prelude-docs /dev/null
tar -Jcf prelude-docs.tar.xz prelude-docs
Expand Down Expand Up @@ -676,7 +699,7 @@ jobs:
rsync -rv -e 'ssh -o "StrictHostKeyChecking no"' prelude-docs/* [email protected]:/var/www/htdocs/futhark-lang.org/docs/prelude/
- name: make nightly release
uses: "marvinpinto/action-automatic-releases@v1.2.1"
uses: "marvinpinto/action-automatic-releases@latest"
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
automatic_release_tag: "nightly"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Nix
uses: cachix/install-nix-action@v20
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
runs-on: ubuntu-latest

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

- name: Install Nix
uses: cachix/install-nix-action@v20
Expand Down
Loading

0 comments on commit 279de4a

Please sign in to comment.