Merge branch 'main' into add-transparent-logo-files

jamesbayley · Feb 14, 2024 · 31f3ece · 31f3ece
2 parents e26ffc3 + 247f34c
commit 31f3ece
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 168 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1 +1 @@
-FROM mcr.microsoft.com/devcontainers/go:1.21-bullseye
+FROM mcr.microsoft.com/devcontainers/go:1.22-bookworm
diff --git a/.github/workflows/build.yml → .github/workflows/ci.yml b/.github/workflows/build.yml → .github/workflows/ci.yml
@@ -1,14 +1,20 @@
-name: Build
+name: CI
 
 on:
   push:
-    branches: main
+    branches:
+      - '*'
+      - '!main'
+
+defaults:
+  run:
+    shell: pwsh
 
 jobs:
-  setup:
-    name: CI
+  build:
+    name: Build
     runs-on: Ubuntu-Latest
-
+    
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v3

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -35,6 +35,11 @@
       "editor.rulers": [80]
     },
 
+    "powershell.powerShellDefaultVersion": "7",
+    "powershell.powerShellAdditionalExePaths": {
+      "pwsh": "/usr/local/bin/pwsh"
+    },
+
     "liveServer.settings.root": "/docs",
     "liveServer.settings.file": "index.html",
     "liveServer.settings.host": "localhost",

diff --git a/docs/CNAME b/docs/CNAME
diff --git a/docs/assets/github-mark.svg b/docs/assets/github-mark.svg
diff --git a/docs/favicon.png b/docs/favicon.png
diff --git a/docs/global.css b/docs/global.css
diff --git a/docs/guides/Concrete.md b/docs/guides/Concrete.md
diff --git a/docs/index.html b/docs/index.html
diff --git a/go.mod b/go.mod
@@ -1,3 +1,3 @@
-module github.com/calcpadstudio/gazelle
+module github.com/GazelleKit/gazelle
 
-go 1.21.1
+go 1.22.0
diff --git a/pkg/bluebook/universalsection.go b/pkg/bluebook/universalsection.go
@@ -1,7 +1,7 @@
 package bluebook
 
 import (
-	units "github.com/calcpadstudio/gazelle/pkg/units"
+	units "github.com/GazelleKit/gazelle/pkg/units"
 )
 
 type DimensionsAndProperties struct {

diff --git a/pkg/steel/sections.go b/pkg/steel/sections.go
@@ -1,7 +1,7 @@
 package steel
 
 import (
-	bluebook "github.com/calcpadstudio/gazelle/pkg/bluebook"
+	bluebook "github.com/GazelleKit/gazelle/pkg/bluebook"
 )
 
 type UniversalBeam struct {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		FROM mcr.microsoft.com/devcontainers/go:1.21-bullseye
		FROM mcr.microsoft.com/devcontainers/go:1.22-bookworm