Skip to content

Commit 2f245ad

Browse files
committed
rename omnilink, build changes
1 parent 19447f5 commit 2f245ad

60 files changed

Lines changed: 1030 additions & 504 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.devcontainer/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:latest
1+
FROM mcr.microsoft.com/devcontainers/base:ubuntu
22

33
RUN apt-get update \
44
&& apt-get install -y openjdk-21-jdk openjdk-21-source \
@@ -8,7 +8,7 @@ RUN apt-get update \
88

99
RUN wget https://go.dev/dl/go1.24.0.linux-amd64.tar.gz
1010
RUN tar -C /usr/local -xzf go1.24.0.linux-amd64.tar.gz
11-
ENV PATH="$PATH:/usr/local/go/bin:/home/${USERNAME}/go/bin"
11+
ENV PATH="$PATH:/usr/local/go/bin:/home/vscode/go/bin"
1212
RUN go version
1313

1414
ENV EDITOR="code --wait"

‎.devcontainer/devcontainer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"build": {
44
"dockerfile": "Dockerfile"
55
},
6-
"remoteUser": "ubuntu",
6+
"remoteUser": "vscode",
77
"customizations": {
88
"vscode": {
99
"extensions": [
@@ -18,10 +18,10 @@
1818
}
1919
},
2020
"postCreateCommand": {
21-
// "setup_sc": "rm -rf out/ .bloop/ .bsp/ .metals/ && ./mill mill.bsp/install"
21+
"autocomplete": "rm -rf out/ .scala-build/ .bloop/ .bsp/ .metals/ && ./mill mill.tabcomplete/install && echo source ~/.cache/mill/download/mill-completion.sh >>~/.bashrc"
2222
},
2323
"postStartCommand": {
24-
"autocomplete": "rm -rf out/ .bloop/ .bsp/ .metals/ && ./mill mill.bsp/install && ./mill mill.tabcomplete/install"
24+
"bspinstall": "rm -rf out/ .scala-build/ .bloop/ .bsp/ .metals/ && ./mill mill.bsp/install"
2525
},
2626
"features": {
2727
"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,5 @@ test/files/**/*.txt
3232

3333
/.tools/
3434
_apalache-out/
35-
states/
35+
states/
36+
/.cache/

‎build.mill‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ object pgo extends ScalaConfigs with SonatypeCentralPublishModule:
4242
++ Seq(build.tlc.jar())
4343

4444
def mvnDeps = Seq(
45-
mvn"com.lihaoyi::os-lib:0.11.4",
46-
mvn"com.lihaoyi::upickle:4.2.1",
45+
mvn"com.lihaoyi::os-lib:0.11.5",
46+
mvn"com.lihaoyi::upickle:4.3.2",
4747
mvn"io.github.java-diff-utils:java-diff-utils:4.15",
4848
mvn"org.rogach::scallop:5.2.0",
4949
mvn"org.scala-lang.modules::scala-parser-combinators:2.4.0",

‎omnilink/GitRepo.mill‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package build.omnilink
2+
3+
import mill.*
4+
5+
trait GitRepo extends Module:
6+
repo =>
7+
def origin: T[String]
8+
9+
trait CommitHash extends Module:
10+
def origin: T[String] = repo.origin()
11+
def commitHash: T[String]
12+
def dir: T[PathRef] = Task:
13+
os.call(List("git", "clone", origin()), cwd = Task.dest, stdout = os.Inherit, stderr = os.Inherit)
14+
val cloneDir = os.list(Task.dest).filter(os.isDir).head
15+
os.call(List("git", "-c", "advice.detachedHead=false", "checkout", commitHash()), cwd = cloneDir, stdout = os.Inherit, stderr = os.Inherit)
16+
PathRef(cloneDir)
17+
end dir
18+
end CommitHash
19+
end GitRepo
File renamed without changes.

0 commit comments

Comments
 (0)