Merge branch 'main' of github.com:DefangLabs/defang

Author: raphaeltm

.github/workflows/go.yml

@@ -149,24 +149,24 @@ jobs:
         run: go mod download
         working-directory: src
 
-      - name: Run GoReleaser (Linux)
+      - name: Install GoReleaser Pro
         uses: goreleaser/goreleaser-action@v6
         with:
-          distribution: goreleaser-pro # either 'goreleaser' (default) or 'goreleaser-pro'
-          # version: latest
-          args: release --split ${{ !startsWith(github.ref, 'refs/tags/v') && '--snapshot' || '' }} ${{ github.event_name == 'schedule' && '--nightly' || ''}}
-          workdir: src
+          distribution: goreleaser-pro
+          install-only: true
+        env:
+          GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
+
+      - name: Run GoReleaser (Linux)
+        run: goreleaser release --split ${{ !startsWith(github.ref, 'refs/tags/v') && '--snapshot' || '' }} ${{ github.event_name == 'schedule' && '--nightly' || ''}}
+        working-directory: src
         env:
           GGOOS: linux
           GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
 
       - name: Run GoReleaser (Windows)
-        uses: goreleaser/goreleaser-action@v6
-        with:
-          distribution: goreleaser-pro # either 'goreleaser' (default) or 'goreleaser-pro'
-          # version: latest
-          args: release --split ${{ !startsWith(github.ref, 'refs/tags/v') && '--snapshot' || '' }} ${{ github.event_name == 'schedule' && '--nightly' || ''}}
-          workdir: src
+        run: goreleaser release --split ${{ !startsWith(github.ref, 'refs/tags/v') && '--snapshot' || '' }} ${{ github.event_name == 'schedule' && '--nightly' || ''}}
+        working-directory: src
         env:
           GGOOS: windows
           GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
@@ -396,10 +396,10 @@ jobs:
     if: failure() && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
     needs: [go-release, post-release, nix-shell-test, push-docker]
     steps:
-    - name: Slack Notification
-      uses: rtCamp/action-slack-notify@v2
-      env:
-        MSG_MINIMAL: actions url
-        SLACK_COLOR: ${{ job.status }}
-        SLACK_TITLE: Defang CLI workflow failed
-        SLACK_WEBHOOK: ${{ secrets.SLACK_NOTIFIER_WEBHOOK_URL }}
+      - name: Slack Notification
+        uses: rtCamp/action-slack-notify@v2
+        env:
+          MSG_MINIMAL: actions url
+          SLACK_COLOR: error
+          SLACK_TITLE: Defang CLI workflow failed
+          SLACK_WEBHOOK: ${{ secrets.SLACK_NOTIFIER_WEBHOOK_URL }}

.prettierignore

@@ -0,0 +1 @@
+/CODEOWNERS

CODEOWNERS

@@ -1,7 +1,3 @@
-# Code owners automatically determined from commit history
-# Patterns match files or directories followed by one or more owners.
-# Owners here correspond to frequent contributors in the git history.
-
 # Default owners for everything
 *       @nullfunc
 
@@ -13,4 +9,3 @@
 
 # Packaging with Nix
 /pkgs/defang/**   @lionello
-

Makefile

@@ -10,8 +10,17 @@ pre-commit:
 	@if git diff --cached --name-only | grep -q '^src/'; then make -C src lint; fi
 
 .PHONY: pre-push
-pre-push:
+pre-push: src/README.md
 	@make -C src test
 
 setup:
 	go -C src mod tidy
+
+src/README.md: README.md
+	@awk '/^## Develop Once\. Deploy Anywhere\./{p=1} (/^## /||/^### /){if(p&&!/^## Develop Once\. Deploy Anywhere\./){exit}} p' README.md > src/README.md; \
+	awk '/^## Defang CLI/{p=1} (/^## /||/^### /){if(p&&!/^## Defang CLI/){exit}} p' README.md >> src/README.md; \
+	awk '/^## Getting started/{p=1} (/^## /||/^### /){if(p&&!/^## Getting started/){exit}} p' README.md >> src/README.md; \
+	awk '/^## Support/{p=1} (/^## /||/^### /){if(p&&!/^## Support/){exit}} p' README.md >> src/README.md; \
+	awk '/^## Environment Variables/{p=1} (/^## /||/^### /){if(p&&!/^## Environment Variables/){exit}} p' README.md >> src/README.md; \
+	@echo 'src/README.md was updated because root README.md changed. Please add src/README.md to your commit.';
+	@false

README.md

@@ -2,15 +2,15 @@
 ![Discord](https://img.shields.io/discord/1233224785450897561)
 ![GitHub Release](https://img.shields.io/github/v/release/DefangLabs/defang)
 
-# ![Defang](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Element_Wordmark_Slogan/JPG/Dark_Colour_Glow.jpg)
+### ![Defang](https://raw.githubusercontent.com/DefangLabs/defang-assets/main/Logos/Element_Wordmark_Slogan/JPG/Dark_Colour_Glow.jpg)
 
-### Develop Anything. Deploy Anywhere.
+## Develop Once. Deploy Anywhere.
 Take your app from Docker Compose to a secure and scalable deployment on your favorite cloud in minutes.
 
-### Defang CLI
+## Defang CLI
 The Defang Command-Line Interface [(CLI)](https://docs.defang.io/docs/getting-started) is designed for developers who prefer to manage their workflows directly from the terminal. It offers full access to Defang’s capabilities, allowing you to build, test, and deploy applications efficiently to the cloud.
 
-### Defang MCP Server
+## Defang MCP Server
 The Defang Model Context Protocol [(MCP)](https://docs.defang.io/docs/concepts/mcp) Server is tailored for developers who work primarily within integrated development environments (IDEs). It enables seamless cloud deployment from supported editors such as Cursor, Windsurf, VS Code, VS Code Insiders and Claude delivering a fully integrated experience without leaving your development environment.
 
 ## This repo includes:
@@ -78,7 +78,7 @@ Install the Defang CLI from one of the following sources:
 
 ## Support
 
-- File any issues [right here on GitHub](https://github.com/DefangLabs/defang/issues)
+- File any issues [here](https://github.com/DefangLabs/defang/issues)
 
 ## Command completion
 

flake.lock

@@ -16,24 +16,24 @@
         devShell =
           with pkgs;
           mkShell {
-            buildInputs =
-              [
-                buf
-                crane
-                git
-                gnumake
-                less
-                gnused # force Linux `sed` everywhere
-                go_1_23
-                golangci-lint
-                goreleaser
-                nixfmt-rfc-style
-                nodejs_20 # for Pulumi, must match values in package.json
-                openssh
-                pulumi-bin
-                google-cloud-sdk
-                vim
-              ];
+            buildInputs = [
+              buf
+              crane
+              git
+              gnumake
+              less
+              gnused # force Linux `sed` everywhere
+              go_1_23
+              golangci-lint
+              goreleaser
+              nixfmt-rfc-style
+              nodejs_24 # for Pulumi, must match values in package.json
+              openssh
+              pulumi
+              pulumiPackages.pulumi-nodejs
+              google-cloud-sdk
+              vim
+            ];
           };
         packages.defang-cli = pkgs.callPackage ./pkgs/defang/cli.nix { };
         packages.defang-bin = pkgs.callPackage ./pkgs/defang { };

flake.nix

@@ -7,7 +7,7 @@ buildGoModule {
   pname = "defang-cli";
   version = "git";
   src = ../../src;
-  vendorHash = "sha256-VkI1L/yuZKRU8e4TeNZKXmB0hCxI+RvY8iqDlzWrY2s="; # TODO: use fetchFromGitHub
+  vendorHash = "sha256-SpV97d+MskTCcdsBYJe/afzxzCo5TUtAef9m+lZT6/o="; # TODO: use fetchFromGitHub
 
   subPackages = [ "cmd/cli" ];
 

pkgs/defang/cli.nix

@@ -150,7 +150,7 @@ announce:
     enabled: true
 
 nightly:
-  tag_name: devel
+  tag_name: nightly
   publish_release: true
   keep_single_release: true
   version_template: "{{ incpatch .Version }}-{{ .ShortCommit }}-nightly"