diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9f1298a5b3..44d55fee78 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -45,7 +45,7 @@ jobs: - name: Install Nix uses: cachix/install-nix-action@v25 with: - install_url: https://releases.nixos.org/nix/nix-2.13.3/install + install_url: https://releases.nixos.org/nix/nix-2.30.1/install extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} substituters = http://cache.nixos.org https://cache.iog.io diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fa53102049..ba8c27c400 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,7 +30,7 @@ jobs: - name: 'Install Nix' uses: cachix/install-nix-action@v25 with: - install_url: https://releases.nixos.org/nix/nix-2.13.3/install + install_url: https://releases.nixos.org/nix/nix-2.30.1/install extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} substituters = http://cache.nixos.org https://cache.iog.io @@ -99,7 +99,7 @@ jobs: if: ${{ !startsWith(matrix.os, 'self') }} uses: cachix/install-nix-action@v25 with: - install_url: https://releases.nixos.org/nix/nix-2.13.3/install + install_url: https://releases.nixos.org/nix/nix-2.30.1/install extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} substituters = http://cache.nixos.org https://cache.iog.io @@ -133,7 +133,7 @@ jobs: - name: Install Nix uses: cachix/install-nix-action@v26 with: - install_url: https://releases.nixos.org/nix/nix-2.13.3/install + install_url: https://releases.nixos.org/nix/nix-2.30.1/install extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} substituters = http://cache.nixos.org https://cache.iog.io @@ -248,7 +248,7 @@ jobs: - name: 'Install Nix' uses: cachix/install-nix-action@v25 with: - install_url: https://releases.nixos.org/nix/nix-2.13.3/install + install_url: https://releases.nixos.org/nix/nix-2.30.1/install extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} substituters = http://cache.nixos.org https://cache.iog.io diff --git a/.github/workflows/update-deps.yml b/.github/workflows/update-deps.yml index 97bfbca510..9b55b610cc 100644 --- a/.github/workflows/update-deps.yml +++ b/.github/workflows/update-deps.yml @@ -27,7 +27,7 @@ jobs: - name: 'Install Nix/Cachix' uses: cachix/install-nix-action@v19 with: - install_url: https://releases.nixos.org/nix/nix-2.13.3/install + install_url: https://releases.nixos.org/nix/nix-2.30.1/install extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} - uses: cachix/cachix-action@v12 diff --git a/booster/.github/actions/with-docker/action.yml b/booster/.github/actions/with-docker/action.yml deleted file mode 100644 index 06789d058e..0000000000 --- a/booster/.github/actions/with-docker/action.yml +++ /dev/null @@ -1,73 +0,0 @@ -name: 'With Docker' -description: 'Run a given stage with Docker Image' -inputs: - tag: - description: 'Docker image tag to use' - required: true - subdir: - description: 'Subdirectory where code is cloned.' - required: false - default: '' - os: - description: 'OS to setup Docker for.' - required: true - distro: - description: 'Distribution to setup Docker for.' - required: true - hpack: - description: 'hpack version to use.' - required: true - ghc: - description: 'ghc version to use (determine base image)' - required: true - dockerfile: - description: 'Hardcode the path of the dockerfile to use.' - required: false - default: .github/workflows/Dockerfile - docker-run-args: - description: 'Extra arguments to pass to docker run.' - required: false - default: '' - -runs: - using: 'composite' - steps: - - name: 'Set up Docker' - shell: bash {0} - env: - TAG_NAME: ${{ inputs.tag }} - SUBDIR: ${{ inputs.subdir }} - BASE_OS: ${{ inputs.os }} - BASE_DISTRO: ${{ inputs.distro }} - HPACK_VERSION: ${{ inputs.hpack }} - GHC_VERSION: ${{ inputs.ghc }} - DOCKERFILE: ${{ inputs.dockerfile }} - DOCKER_RUN_ARGS: ${{ inputs.docker-run-args }} - run: | - set -euxo pipefail - - USER=$(id -un) - USER_ID=$(id -u) - GROUP=$(id -gn) - GROUP_ID=$(id -g) - - docker build . --file ${SUBDIR}${DOCKERFILE} \ - --tag runtimeverification/${TAG_NAME} \ - --build-arg BASE_OS=${BASE_OS} \ - --build-arg BASE_DISTRO=${BASE_DISTRO} \ - --build-arg HPACK_VERSION=${HPACK_VERSION} \ - --build-arg GHC_VERSION=${GHC_VERSION} \ - --build-arg USER=${USER} --build-arg USER_ID=${USER_ID} \ - --build-arg GROUP=${GROUP} --build-arg GROUP_ID=${GROUP_ID} - - docker run \ - --name ${TAG_NAME} \ - --rm -it \ - --detach \ - --workdir /opt/workspace/${SUBDIR} \ - --user ${USER}:${GROUP} \ - -v "$(pwd):/opt/workspace" \ - -v "/etc/passwd:/etc/passwd:ro" \ - -v "/etc/group:/etc/group:ro" \ - ${DOCKER_RUN_ARGS} \ - runtimeverification/${TAG_NAME} diff --git a/booster/.github/workflows/Dockerfile b/booster/.github/workflows/Dockerfile deleted file mode 100644 index 15269058eb..0000000000 --- a/booster/.github/workflows/Dockerfile +++ /dev/null @@ -1,46 +0,0 @@ -ARG BASE_OS -ARG BASE_DISTRO -ARG HPACK_VERSION -ARG GHC_VERSION - -FROM haskell:${GHC_VERSION}-buster - -ENV TZ America/Chicago -ENV DEBIAN_FRONTEND=noninteractive - -ARG HPACK_VERSION -ARG FOURMOLU_VERSION -ARG HLINT_VERSION - -RUN apt-get update \ - && apt-get install --yes \ - curl \ - libsecp256k1-0 \ - libsecp256k1-dev \ - libtinfo5 \ - locales \ - git \ - z3 - -RUN locale-gen en_US.UTF-8 -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US:en -ENV LC_ALL en_US.UTF-8 - -# install hpack and hlint from binary packages -RUN curl -sSL https://github.com/sol/hpack/releases/download/${HPACK_VERSION}/hpack_linux.gz | gunzip -c > /usr/bin/hpack \ - && chmod +x /usr/bin/hpack \ - && hpack --version - -# The image is built specifically for an environment with this user/group -ARG USER=github-user -ARG GROUP=$USER -ARG USER_ID=1000 -ARG GROUP_ID=$USER_ID -RUN groupadd -g $GROUP_ID $GROUP && useradd -m -u $USER_ID -s /bin/sh -g $GROUP $USER - -USER $USER:$GROUP -ENV PATH $PATH:/home/$USER/.cabal/bin - -RUN cd $HOME \ - && cabal update \ No newline at end of file diff --git a/booster/.github/workflows/nix.conf b/booster/.github/workflows/nix.conf deleted file mode 100644 index e2a5c22321..0000000000 --- a/booster/.github/workflows/nix.conf +++ /dev/null @@ -1,3 +0,0 @@ -experimental-features = nix-command flakes -substituters = https://cache.nixos.org/ https://runtimeverification.cachix.org https://cache.iog.io -trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= runtimeverification.cachix.org-1:z2UVwHPthsW4qRSfcnG3veR/MFdZp8HS0f8kgacAjvA= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= diff --git a/booster/.github/workflows/update-deps.yml b/booster/.github/workflows/update-deps.yml deleted file mode 100644 index 6ebe725a41..0000000000 --- a/booster/.github/workflows/update-deps.yml +++ /dev/null @@ -1,81 +0,0 @@ -name: 'Update Nix Flake Inputs' -on: - push: - branches: - - '_update-deps/runtimeverification/haskell-backend' - workflow_dispatch: -# Stop in progress workflows on the same branch and same workflow to use latest committed code -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -env: - ghc_version: '9.6.4' - stack_version: "2.15.1" - -jobs: - - nix-flake-submodule-sync: - name: 'Nix flake submodule sync' - runs-on: ubuntu-20.04 - steps: - - name: 'Check out code, set up Git' - uses: actions/checkout@v4 - with: - token: ${{ secrets.JENKINS_GITHUB_PAT }} - submodules: recursive - - run: | - git config --global user.name rv-jenkins - git config --global user.email devops@runtimeverification.com - - - name: 'Install Nix' - uses: cachix/install-nix-action@v22 - with: - install_url: https://releases.nixos.org/nix/nix-2.13.3/install - extra_nix_config: | - access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} - substituters = http://cache.nixos.org https://hydra.iohk.io - trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= - - - name: 'Install Cachix' - uses: cachix/cachix-action@v14 - with: - name: k-framework - authToken: '${{ secrets.CACHIX_PUBLIC_TOKEN }}' - - - uses: haskell/actions/setup@v2 - id: setup-haskell - with: - ghc-version: ${{ env.ghc_version }} - stack-version: ${{ env.stack_version }} - enable-stack: true - stack-setup-ghc: true - cabal-update: true - - - name: 'Install libsecp256k1' - run: | - sudo apt-get update - sudo apt-get install --yes \ - libsecp256k1-0 \ - libsecp256k1-dev - - - name: 'Update Nix flake from haskell backend release tag' - run: | - set -euxo pipefail - changed=false - - haskell_backend_version=$(cat deps/haskell-backend_release) - sed -i 's! haskell-backend.url = "github:runtimeverification/haskell-backend/[0-9a-f]*";! haskell-backend.url = "github:runtimeverification/haskell-backend/'${haskell_backend_version}'";!' flake.nix - - if ! git diff --exit-code flake.nix; then - git add flake.nix - changed=true - fi - - if ${changed}; then - cabal update - scripts/update-haskell-backend.sh ${haskell_backend_version} - git add flake.lock stack.yaml stack.yaml.lock cabal.project # cabal.project.freeze - git commit -m "update haskell-backend to version ${haskell_backend_version}" - git push - fi