Skip to content

Commit

Permalink
Revert "Set LLVM backend up to receive automatic updates from scala-k…
Browse files Browse the repository at this point in the history
…ore" (#1010)

Reverts #1008
  • Loading branch information
Dwight Guth authored Mar 8, 2024
1 parent 104b2de commit 30324a4
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 82 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/clang-format-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,10 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v4
- uses: ludeeus/action-shellcheck@2.0.0
- uses: ludeeus/action-shellcheck@1.1.0
name: Check that shell scripts follow best practices
with:
scandir: './bin'
additional_files: './scripts/update-scala-kore.sh'

clang-tidy-check:
name: Clang Tidy check
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/test-flake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@ jobs:
- name: 'Build LLVM backend'
run: GC_DONT_GC=1 nix build --print-build-logs .

- name: 'Build pattern matching compiler'
run: GC_DONT_GC=1 nix build --print-build-logs .#llvm-backend-matching

- name: 'Test LLVM backend'
run: GC_DONT_GC=1 nix flake check --print-build-logs

Expand Down
32 changes: 0 additions & 32 deletions .github/workflows/update-deps.yml

This file was deleted.

1 change: 0 additions & 1 deletion matching/deps/scala_kore_release

This file was deleted.

30 changes: 7 additions & 23 deletions matching/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>
<groupId>com.runtimeverification.k</groupId>
<parent>
<groupId>com.runtimeverification.k</groupId>
<artifactId>parent</artifactId>
<version>1.0-SNAPSHOT</version>
<relativePath>../../../../../..</relativePath>
</parent>
<artifactId>llvm-backend-matching</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>K Framework LLVM Backend Pattern Matching</name>

<properties>
<java.version>17</java.version>
<scala-kore.version>0.3.0</scala-kore.version>
<spotless.version>2.41.1</spotless.version>
<scala.majorVersion>2.12</scala.majorVersion>
<scala.minorVersion>18</scala.minorVersion>
<scala.version>${scala.majorVersion}.${scala.minorVersion}</scala.version>
<scalafmt.version>3.7.17</scalafmt.version>
</properties>

<repositories>
<repository>
<id>runtime.verification</id>
Expand All @@ -38,20 +32,10 @@
</repositories>

<dependencies>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${scala.version}</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-reflect</artifactId>
<version>${scala.version}</version>
</dependency>
<dependency>
<groupId>com.runtimeverification.k</groupId>
<artifactId>scala-kore</artifactId>
<version>${scala-kore.version}</version>
<version>0.3.0</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
Expand Down
4 changes: 0 additions & 4 deletions nix/llvm-backend-matching.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ let self = maven.buildMavenPackage rec {

buildOffline = true;

manualMvnArtifacts = [
"org.scala-lang:scala-compiler:2.12.18"
];

passthru = {
jar =
"${self}/share/java/llvm-backend-matching-1.0-SNAPSHOT-jar-with-dependencies.jar";
Expand Down
2 changes: 1 addition & 1 deletion nix/overlay.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ let

llvm-backend-matching = import ./llvm-backend-matching.nix {
src = prev.llvm-backend-matching-src;
mvnHash = "sha256-1Al6O/uzlV9QOqWg7M7pQmgOiRe8nAfg/nVGGCcZbwo=";
mvnHash = "sha256-g5H5C7oYdBZBIPdeyTH7ai29QfNCKVhn8C3hK06ZNj4";
inherit (final) maven;
};

Expand Down
16 changes: 0 additions & 16 deletions scripts/update-scala-kore.sh

This file was deleted.

0 comments on commit 30324a4

Please sign in to comment.