devel: Remove devcontainer and use_nix in direvn
Some checks failed
Build / build (push) Failing after 13s

This commit is contained in:
2026-01-25 09:14:39 +01:00
parent fbe9c51f86
commit 2fb1690e7c
8 changed files with 29 additions and 62 deletions

View File

@@ -1,32 +0,0 @@
FROM mcr.microsoft.com/dotnet/sdk:10.0
# Bun version
ARG BUN_INSTALL=/usr/local
ARG BUN_VERSION=bun-v1.2.16
# Install node, 7zip, yarn, git, process tools
RUN apt-get update \
&& apt-get install -y p7zip-full git procps ssh-client unzip
# Install Bun
RUN set -eux; \
curl -fsSL https://bun.sh/install > /usr/local/bin/install-bun \
&& chmod +x /usr/local/bin/install-bun \
&& /usr/local/bin/install-bun $BUN_VERSION debug-info
ENV BUN_INSTALL=/usr/local
# Clean up
RUN apt-get autoremove -y \
&& apt-get clean -y \
&& rm -rf /var/lib/apt/lists/*
# Trouble brewing
RUN rm /etc/ssl/openssl.cnf
# Add dotnet tools to path to pick up fake and paket installation
ENV PATH="/root/.dotnet/tools:${PATH}"
# Copy endpoint specific user settings into container to specify
# .NET Core should be used as the runtime.
COPY settings.vscode.json /root/.vscode-remote/data/Machine/settings.json

View File

@@ -1,11 +0,0 @@
{
"name": "SAFE",
"dockerFile": "Dockerfile",
"appPort": [8080, 8085],
"extensions": [
"ionide.ionide-fsharp",
"ms-dotnettools.csharp",
"editorconfig.editorconfig",
"msjsdiag.debugger-for-chrome"
]
}

View File

@@ -1,3 +0,0 @@
{
"FSharp.fsacRuntime":"netcore"
}

9
.envrc
View File

@@ -1,9 +1,4 @@
#!/usr/bin/env bash
# the shebang is ignored, but nice for editors
if type -P lorri &>/dev/null; then
eval "$(lorri direnv)"
else
echo 'while direnv evaluated .envrc, could not find the command "lorri" [https://github.com/nix-community/lorri]'
use nix
fi
dotenv_if_exists
use nix

View File

@@ -0,0 +1,24 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/github-workflow.json
name: Build
on:
push:
branches: [main]
pull_request:
branches: [main]
env:
DOTNET_NOLOGO: true
DOTNET_CLI_TELEMETRY_OPTOUT: true
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
NUGET_XMLDOC_MODE: ""
DOTNET_MULTILEVEL_LOOKUP: 0
jobs:
build:
runs-on: nix
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Build
run: nix build -f .

View File

@@ -1,6 +1,6 @@
MIT License
Copyright (c) 2020 Serit Tromsø AS
Copyright (c) 2026 Oceanbox AS
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

View File

@@ -16,7 +16,6 @@ let
dotnet-runtime = pkgs.dotnetCorePackages.runtime_10_0;
geojson = pkgs.callPackage ./src {
inherit (nix-utils.output.lib.nuget) deps;
inherit
dotnet-sdk
dotnet-runtime
@@ -44,6 +43,7 @@ in
fantomas
fsautocomplete
dotnet-sdk
nuget-to-json
];
NPINS_DIRECTORY = "nix";

View File

@@ -1,6 +1,4 @@
{
deps,
pkgs,
dotnet-sdk,
nix-gitignore,
dotnet-runtime,
@@ -18,11 +16,7 @@ buildDotnetModule {
projectFile = "src/Oceanbox.GeoJson.fsproj";
dotnetRestoreFlags = "--force-evaluate";
nugetDeps = deps {
inherit pkgs name;
lockfiles = [ ./packages.lock.json ];
};
nugetDeps = ./deps.json;
packNupkg = true;
doCheck = false;
}