diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 59c68b1766..0000000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,36 +0,0 @@ -jobs: - build: - docker: - # For now, just reuse mina's Docker toolchain. In the future, we should compose Mina's from Snarky's somehow - - image: gcr.io/o1labs-192920/mina-toolchain@sha256:78508e55d17020f893971f3e5d03645c3ce35644d545ec4584322b165bfbd751 - steps: - - checkout - - run: - name: Lint - command: eval `opam config env` && make check-format - - run: eval `opam config env` && make build - - run: eval `opam config env` && make tests - opam-pin: - docker: - # For now, just reuse mina's Docker toolchain. In the future, we should compose Mina's from Snarky's somehow - - image: gcr.io/o1labs-192920/mina-toolchain@sha256:78508e55d17020f893971f3e5d03645c3ce35644d545ec4584322b165bfbd751 - steps: - - checkout - - run: - name: opam pin - command: eval `opam config env` && opam pin . - website: - docker: - - image: node - steps: - - checkout - - run: - name: Test a release build of the website - command: make test-website-build -workflows: - version: 2 - snarky_parallel: - jobs: - - website - - build - - opam-pin diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 4c12d61054..6e5c4e9758 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -4,7 +4,7 @@ on: [pull_request] jobs: - buildx: + docker-build: runs-on: ubuntu-latest steps: - @@ -12,7 +12,7 @@ jobs: uses: actions/checkout@v2 - uses: docker/setup-buildx-action@v1 - id: buildx + id: docker-build with: install: true - diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml deleted file mode 100644 index c535845cea..0000000000 --- a/.github/workflows/stale.yml +++ /dev/null @@ -1,35 +0,0 @@ -# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time. -# -# You can adjust the behavior by modifying this file. -# For more information, see: -# https://github.com/actions/stale -name: Mark stale issues and pull requests - -on: - schedule: -# ┌───────────── minute (0 - 59) -# │ ┌───────────── hour (0 - 23) -# │ │ ┌───────────── day of the month (1 - 31) -# │ │ │ ┌───────────── month (1 - 12) -# │ │ │ │ ┌───────────── day of the week (0 - 6) -# │ │ │ │ │ -# │ │ │ │ │ -# │ │ │ │ │ - - cron: '19 7 * * *' - -jobs: - stale: - - runs-on: ubuntu-latest - permissions: - issues: write - pull-requests: write - - steps: - - uses: actions/stale@v3 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - stale-issue-message: 'Stale issue message' - stale-pr-message: 'Stale pull request message' - stale-issue-label: 'no-issue-activity' - stale-pr-label: 'no-pr-activity' diff --git a/Dockerfile b/Dockerfile index 0d55d56949..e7e93029ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,15 +4,13 @@ FROM ocaml/opam:debian-ocaml-4.14 RUN sudo apt-get update RUN sudo apt-get install -y \ build-essential \ - pkg-config=0.29.2-1 \ + pkg-config \ git \ - libffi-dev=3.3-6 \ - libgmp-dev=2:6.2.1+dfsg-1+deb11u1 \ - libgmp3-dev=2:6.2.1+dfsg-1+deb11u1 \ - libprocps-dev=2:3.3.17-5 \ + libffi-dev \ + libgmp-dev \ + libgmp3-dev \ libssl-dev \ - m4=1.4.18-5 - + m4 # Create a volume we can work in. For initial build, # we'll copy the local context. To update the snarky