Merge remote-tracking branch 'origin/develop' into feature/map-generator

# Conflicts: # src/api/routes.go # ui/App/App.jsx
OpenFactorioServerManager · Nov 22, 2023 · 7c654a5 · 7c654a5
2 parents 7160d00 + 95a8511
commit 7c654a5
Show file tree

Hide file tree

Showing 21 changed files with 6,163 additions and 8,762 deletions.
diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml
@@ -1,4 +1,4 @@
-on: 
+on:
   push:
     branches:
       - '**'
@@ -21,13 +21,13 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
       - run: make app/bundle
   test-go:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        go: ['1.15', '1.16', '1.17', '1']
+        go: ['1.18', '1.20', '1']
     runs-on: ${{ matrix.os }}
     name: test-go ${{ matrix.go }} (${{ matrix.os }})
     steps:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [0.11.0] - TBD
 ### Changed
 - Configuration environment variables are now uppercase and prefixed with FSM
+- updated all dependencies - Thanks to @jannaahs and @knoxfighter
+- removed CGO as dependency
 
 ## [0.10.1] - 2021-03-09
 ### Fixed

diff --git a/Makefile b/Makefile
@@ -28,13 +28,13 @@ factorio-server-manager-linux:
 	@echo "Building Backend - Linux"
 	@mkdir -p factorio-server-manager
 	@cd src; \
-	CGO_ENABLED=1 GO111MODULE=on GOOS=linux GOARCH=amd64 go build -o ../factorio-server-manager/factorio-server-manager .
+	CGO_ENABLED=0 GO111MODULE=on GOOS=linux GOARCH=amd64 go build -o ../factorio-server-manager/factorio-server-manager .
 
 factorio-server-manager-windows:
 	@echo "Building Backend - Windows"
 	@mkdir -p factorio-server-manager
 	@cd src; \
-	GO111MODULE=on GOOS=windows GOARCH=amd64 CGO_ENABLED=1 CXX=x86_64-w64-mingw32-g++ CC=x86_64-w64-mingw32-gcc go build -ldflags="-extldflags=-static" -o ../factorio-server-manager/factorio-server-manager.exe .
+	GO111MODULE=on GOOS=windows GOARCH=amd64 CGO_ENABLED=0 CXX=x86_64-w64-mingw32-g++ CC=x86_64-w64-mingw32-gcc go build -ldflags="-extldflags=-static" -o ../factorio-server-manager/factorio-server-manager.exe .
 
 gen_release: build/factorio-server-manager-linux.zip build/factorio-server-manager-windows.zip
 	@echo "Done"