ci: remove release make concurrency to fix docker image race (#13769 )

(cherry picked from commit a114288ef2)
ci: use postgres version 13 to test migrations (#13767 )
2024-07-02 17:54:06 +00:00 · 2024-07-02 17:04:33 +00:00 · 2024-07-02 16:02:26 +00:00
3 changed files with 11 additions and 3 deletions
@@ -180,7 +180,7 @@ jobs:

      - name: Test migrations from current ref to main
        run: |
-          make test-migrations
+          POSTGRES_VERSION=13 make test-migrations

      # Setup GCloud for signing Windows binaries.
      - name: Authenticate to Google Cloud
@@ -297,7 +297,7 @@ jobs:

          # build Docker images for each architecture
          version="$(./scripts/version.sh)"
-          make -j build/coder_"$version"_linux_{amd64,arm64,armv7}.tag
+          make build/coder_"$version"_linux_{amd64,arm64,armv7}.tag

          # we can't build multi-arch if the images aren't pushed, so quit now
          # if dry-running
@@ -308,7 +308,7 @@ jobs:

          # build and push multi-arch manifest, this depends on the other images
          # being pushed so will automatically push them.
-          make -j push/build/coder_"$version"_linux.tag
+          make push/build/coder_"$version"_linux.tag

          # if the current version is equal to the highest (according to semver)
          # version in the repo, also create a multi-arch image as ":latest" and
@@ -25,6 +25,7 @@
  "datagrip.svg",
  "dataspell.svg",
  "debian.svg",
+  "desktop.svg",
  "discord.svg",
  "do.png",
  "docker-white.svg",
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path d="M31 6V22C31 23.65 29.65 25 28 25H4C2.35 25 1 23.65 1 22V6C1 4.35 2.35 3 4 3H28C29.65 3 31 4.35 31 6Z" fill="#2197F3"/>
+  <path d="M21 27H17V24C17 23.4478 16.5522 23 16 23C15.4478 23 15 23.4478 15 24V27H11C10.4478 27 10 27.4478 10 28C10 28.5522 10.4478 29 11 29H21C21.5522 29 22 28.5522 22 28C22 27.4478 21.5522 27 21 27Z" fill="#FFC10A"/>
+  <path d="M31 17V22C31 23.65 29.65 25 28 25H4C2.35 25 1 23.65 1 22V17H31Z" fill="#3F51B5"/>
+</svg>
Author	SHA1	Message	Date
Mathias Fredriksson	56bf386b15	ci: remove release make concurrency to fix docker image race (#13769 ) (cherry picked from commit `a114288ef2`)	2024-07-02 17:54:06 +00:00
Cian Johnston	c620bffbb3	ci: use postgres version 13 to test migrations (#13767 ) (cherry picked from commit `5ea5db29e9`)	2024-07-02 17:04:33 +00:00
Michael Smith	84d992062b	chore: add SVG desktop icon (#13765 ) * chore: add SVG desktop icon * fix: add desktop icon to to icons.json (cherry picked from commit `21a923a7a0`)	2024-07-02 16:02:26 +00:00