Skip to content

Commit

Permalink
Merge pull request #58 from Mala1180/main
Browse files Browse the repository at this point in the history
Align Develop with Main
  • Loading branch information
Mala1180 authored Aug 29, 2023
2 parents d9caf77 + 98802bc commit b6a67e9
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 6 deletions.
19 changes: 16 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Satify CI Build
name: Satify Build, Format and Coverage

on:
push:
Expand Down Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Run tests
run: sbt test

formatting:
format:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand All @@ -45,5 +45,18 @@ jobs:
java-version: '17'
distribution: 'temurin'
cache: 'sbt'
- name: Check scalafmt formatting
- name: Check scalafmt format
run: sbt scalafmtCheckAll

coverage:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'
cache: 'sbt'
- name: Run tests with coverage
run: sbt jacoco
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
types:
- closed
branches:
- test
- main

permissions:
contents: write
Expand All @@ -30,7 +30,7 @@ jobs:
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
automatic_release_tag: "latest"
title: "Sprint 3 Release (${{ github.ref_name }})"
title: "Sprint 3 Release"
prerelease: true
files: |
target/scala-3.3.0/satify.jar
13 changes: 13 additions & 0 deletions doc/process/3-product-backlog.md
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,20 @@ The deadline for this sprint is 28/08/2023.

## Sprint Review

The sprint terminates with all tasks completed except for the problem instances.

A prototype is released, which permits inserting a more complex input using the DSL.
It is possible to solve the SAT problem using the DPLL, and also importing a problem in DIMACS format.

## Sprint Retrospective

We discovered a problem in the Tseitin Transformation that was corrected in this sprint.

We thought that the use of monads could be useful to handle all the tree data
structures, but the change would complicate the design, therefore, in the next Sprint we will
evaluate the pros and cons of an eventual implementation.

Finally, some tasks on code and package organization are demanded to the next sprint because of the lack of time.

---
[Previous](2-product-backlog.md) | [Next](4-product-backlog.md)
2 changes: 1 addition & 1 deletion doc/report/1-methodology.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,4 @@ Our goal was not to obtain a 100% coverage, but to have a good coverage (percent
functionalities of the software.

---
[Previous](README.md) | [Next](2-requirements.md)
[Back to Index](README.md) | [Next](2-requirements.md)

0 comments on commit b6a67e9

Please sign in to comment.