From dd45663e03ea4fd8174d0c15c7a813bcb891e700 Mon Sep 17 00:00:00 2001 From: Jacob Salzberg Date: Tue, 29 Oct 2024 14:09:08 -0400 Subject: [PATCH 1/5] Add ci workflow --- .github/workflows/ci.yml | 12 +++++++----- .gitignore | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2655ac4..e009e29 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,8 +1,12 @@ name: Builds, tests & co on: - pull_request: + # Triggers the workflow on push or pull request events but only for the "main" branch push: + branches: [ "dev" ] + pull_request: + branches: [ "dev" ] + # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -14,7 +18,6 @@ jobs: fail-fast: false matrix: os: - - macos-latest - ubuntu-latest ocaml-compiler: - "5.1" @@ -22,8 +25,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - - name: Checkout tree - uses: actions/checkout@v4 + - uses: actions/checkout@v4 - name: Set-up OCaml ${{ matrix.ocaml-compiler }} uses: ocaml/setup-ocaml@v2 @@ -34,4 +36,4 @@ jobs: - run: opam exec -- dune build - - run: opam exec -- dune runtest \ No newline at end of file + - run: opam exec -- dune runtest diff --git a/.gitignore b/.gitignore index 4e037cc..6113790 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ log*.smt2 .DS_Store front_end_processed_output.log smt-encodings/* +.github/JCOBS_SSH_KEY \ No newline at end of file From 1fc7eea00ac483192c692af1682b629be2c7f8b2 Mon Sep 17 00:00:00 2001 From: Jacob Salzberg Date: Tue, 29 Oct 2024 14:10:58 -0400 Subject: [PATCH 2/5] Add ci to the ci workflows --- .github/workflows/blank.yml | 36 ------------------------------------ .github/workflows/ci.yml | 4 ++-- .gitignore | 3 +-- 3 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 .github/workflows/blank.yml diff --git a/.github/workflows/blank.yml b/.github/workflows/blank.yml deleted file mode 100644 index 0be872d..0000000 --- a/.github/workflows/blank.yml +++ /dev/null @@ -1,36 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: CI - -# Controls when the workflow will run -on: - # Triggers the workflow on push or pull request events but only for the "main" branch - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - # This workflow contains a single job called "build" - build: - # The type of runner that the job will run on - runs-on: ubuntu-latest - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v3 - - # Runs a single command using the runners shell - - name: Run a one-line script - run: dune clean; dune build @fmt; dune runtest - - # Runs a set of commands using the runners shell - - name: Run a multi-line script - run: | - echo Add other actions to build, - echo test, and deploy your project. diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e009e29..581851d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,9 +3,9 @@ name: Builds, tests & co on: # Triggers the workflow on push or pull request events but only for the "main" branch push: - branches: [ "dev" ] + branches: [ "dev", "ci" ] pull_request: - branches: [ "dev" ] + branches: [ "dev", "ci" ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: diff --git a/.gitignore b/.gitignore index 6113790..9e6160c 100644 --- a/.gitignore +++ b/.gitignore @@ -8,5 +8,4 @@ log*.smt2 .vscode .DS_Store front_end_processed_output.log -smt-encodings/* -.github/JCOBS_SSH_KEY \ No newline at end of file +smt-encodings/* \ No newline at end of file From a209c932cc79511cf85091d27cbad202cade86e5 Mon Sep 17 00:00:00 2001 From: Jacob Salzberg Date: Tue, 29 Oct 2024 15:55:02 -0400 Subject: [PATCH 3/5] Test the ci on skolem --- .github/workflows/ci.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 581851d..ec8a076 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,13 +16,8 @@ jobs: build: strategy: fail-fast: false - matrix: - os: - - ubuntu-latest - ocaml-compiler: - - "5.1" - runs-on: ${{ matrix.os }} + runs-on: [self-hosted, linux] steps: - uses: actions/checkout@v4 From 836cea853cbcc2b3eb94be3e867cbbba2263576d Mon Sep 17 00:00:00 2001 From: Jacob Salzberg Date: Tue, 29 Oct 2024 15:56:53 -0400 Subject: [PATCH 4/5] Require only self-hosted --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ec8a076..bd1faeb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false - runs-on: [self-hosted, linux] + runs-on: self-hosted steps: - uses: actions/checkout@v4 From 7fa9952c625a61a9f223c326e7c7707ba9f90831 Mon Sep 17 00:00:00 2001 From: Jacob Salzberg Date: Tue, 29 Oct 2024 16:36:12 -0400 Subject: [PATCH 5/5] Add ocaml compiler version --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bd1faeb..19d0c73 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: - name: Set-up OCaml ${{ matrix.ocaml-compiler }} uses: ocaml/setup-ocaml@v2 with: - ocaml-compiler: ${{ matrix.ocaml-compiler }} + ocaml-compiler: "5.1" - run: opam install . --deps-only --with-test