Skip to content

Commit

Permalink
Merge pull request #239 from membermatters/dev
Browse files Browse the repository at this point in the history
v3.6.0
  • Loading branch information
jabelone authored Jan 17, 2024
2 parents ae09772 + 109beb0 commit 62f298b
Show file tree
Hide file tree
Showing 21 changed files with 503 additions and 135 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/black.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Python Linter (Black)
on: [push, pull_request]

jobs:
lint:
lint-backend:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build_docker.dev.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name: Build Docker Image (DEV Branch)
name: Build Docker Image (On Dev Push)

on:
push:
branches:
- "dev"

jobs:
docker:
build-docker-dev:
runs-on: ubuntu-latest
steps:
- name: Set up QEMU
Expand All @@ -18,11 +18,11 @@ jobs:
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push
- name: Build and Push
id: docker_build
uses: docker/build-push-action@v3
with:
file: docker/Dockerfile
platforms: linux/amd64
push: true
tags: membermatters/membermatters:dev
tags: membermatters/membermatters:dev,membermatters/membermatters:${{github.sha}}
27 changes: 27 additions & 0 deletions .github/workflows/build_docker.pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Build Docker Image (On PR)

on:
pull_request:
branches:
- "dev"

jobs:
build-docker-pr:
runs-on: ubuntu-latest
steps:
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Login to DockerHub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build Docker Image
id: docker_build
uses: docker/build-push-action@v3
with:
file: docker/Dockerfile
platforms: linux/amd64
push: false
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build Docker Image (Prod Release)
name: Build Docker Image (On Prod Release)

on:
push:
Expand All @@ -7,7 +7,7 @@ on:
- "!v[0-9]+.[0-9]+.[0-9]+-*"

jobs:
docker:
build-docker-release:
runs-on: ubuntu-latest
steps:
- name: Set up QEMU
Expand Down
60 changes: 30 additions & 30 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ name: "CodeQL"

on:
push:
branches: [ main, dev ]
branches:
- "dev"
pull_request:
# The branches below must be a subset of the branches above
branches: [ main, dev ]
schedule:
- cron: '36 19 * * 4'
branches:
- "dev"

jobs:
analyze:
Expand All @@ -28,40 +28,40 @@ jobs:
strategy:
fail-fast: false
matrix:
language: [ 'javascript', 'python' ]
language: ["javascript", "python"]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
# Learn more:
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed

steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Checkout repository
uses: actions/checkout@v2

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release
#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
2 changes: 1 addition & 1 deletion .github/workflows/eslint.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: JavaScript Linter (eslint)
on: [push, pull_request]
jobs:
build:
lint-frontend:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,24 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [v3.6.0] - 2024-01-17

### Added

- SMS logging
- Send SMS notification to member feature

### Changed

- Some of the Django log_types options to be more brief/consistent
- Some of the GHA workflows to be more consistent
- The main readme to be more up to date/accurate

### Fixed

- #232 email sending bug (thanks @snoopen)
- Email template rendering bug with footer (thanks @snoopen)

## [v3.5.0] - 2024-01-06

### Removed
Expand Down
Loading

0 comments on commit 62f298b

Please sign in to comment.