Skip to content

Commit 4df46a0

Browse files
authored
Merge pull request #2391 from opengovsg/release-1.79.2
Release 1.79.2 `release`
2 parents 2ecd155 + 705f15a commit 4df46a0

File tree

5 files changed

+52
-58
lines changed

5 files changed

+52
-58
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 35 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# You may wish to alter this file to override the set of languages analyzed,
55
# or to provide custom queries or build logic.
6-
name: "CodeQL"
6+
name: 'CodeQL'
77

88
on:
99
push:
@@ -12,60 +12,45 @@ on:
1212
# The branches below must be a subset of the branches above
1313
branches: [develop]
1414
schedule:
15-
- cron: '0 21 * * 3'
15+
- cron: '0 10 * * *'
1616

1717
jobs:
1818
analyze:
19-
name: Analyze
20-
runs-on: ubuntu-22.04
19+
name: Analyze (${{matrix.language}})
20+
runs-on: ${{(matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest'}}
21+
timeout-minutes: ${{(matrix.language == 'swift' && 120) || 360}}
22+
permissions:
23+
# Required for all workflows
24+
security-events: write
25+
26+
# Required to fetch internal or private CodeQL packs
27+
packages: read
28+
29+
# Only required for workflows in private repositories
30+
actions: read
31+
contents: read
2132

2233
strategy:
2334
fail-fast: false
2435
matrix:
25-
# Override automatic language detection by changing the below list
26-
# Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
27-
language: ['javascript']
28-
# Learn more...
29-
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
30-
36+
include:
37+
- language: javascript-typescript
38+
build-mode: none
3139
steps:
32-
- name: Checkout repository
33-
uses: actions/checkout@v2
34-
with:
35-
# We must fetch at least the immediate parents so that if this is
36-
# a pull request then we can checkout the head.
37-
fetch-depth: 2
38-
39-
# If this run was triggered by a pull request event, then checkout
40-
# the head of the pull request instead of the merge commit.
41-
- run: git checkout HEAD^2
42-
if: ${{ github.event_name == 'pull_request' }}
43-
44-
# Initializes the CodeQL tools for scanning.
45-
- name: Initialize CodeQL
46-
uses: github/codeql-action/init@v1
47-
with:
48-
languages: ${{ matrix.language }}
49-
# If you wish to specify custom queries, you can do so here or in a config file.
50-
# By default, queries listed here will override any specified in a config file.
51-
# Prefix the list here with "+" to use these queries and those in the config file.
52-
# queries: ./path/to/local/query, your-org/your-repo/queries@main
53-
54-
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
55-
# If this step fails, then you should remove it and run the build manually (see below)
56-
- name: Autobuild
57-
uses: github/codeql-action/autobuild@v1
58-
59-
# ℹ️ Command-line programs to run using the OS shell.
60-
# 📚 https://git.io/JvXDl
61-
62-
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
63-
# and modify them (or add more) to build your code if your project
64-
# uses a compiled language
65-
66-
#- run: |
67-
# make bootstrap
68-
# make release
69-
70-
- name: Perform CodeQL Analysis
71-
uses: github/codeql-action/analyze@v1
40+
- name: Checkout repository
41+
uses: actions/checkout@v4
42+
43+
# Initializes the CodeQL tools for scanning.
44+
- name: Initialize CodeQL
45+
uses: github/codeql-action/init@v3
46+
with:
47+
languages: ${{matrix.language}}
48+
build-mode: ${{matrix.build-mode}}
49+
50+
# Pull config from https://github.com/opengovsg/codeql-config/blob/prod/codeql-config.yml
51+
config-file: opengovsg/codeql-config/codeql-config.yml@prod
52+
53+
- name: Perform CodeQL Analysis
54+
uses: github/codeql-action/analyze@v3
55+
with:
56+
category: '/language:${{matrix.language}}'

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,17 @@ All notable changes to this project will be documented in this file. Dates are d
44

55
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
66

7+
#### [v1.79.2](https://github.com/opengovsg/GoGovSG/compare/v1.79.1...v1.79.2)
8+
9+
- chore: correct capitalization of GoGovSG in README.md [`#2390`](https://github.com/opengovsg/GoGovSG/pull/2390)
10+
- chore: fix codeql [`#2385`](https://github.com/opengovsg/GoGovSG/pull/2385)
11+
- chore: fix formatting [`#2384`](https://github.com/opengovsg/GoGovSG/pull/2384)
12+
- [develop] 1.79.1 [`#2383`](https://github.com/opengovsg/GoGovSG/pull/2383)
13+
714
#### [v1.79.1](https://github.com/opengovsg/GoGovSG/compare/v1.79.0...v1.79.1)
815

16+
> 17 June 2025
17+
918
- fix: remove statistics repo [`#2381`](https://github.com/opengovsg/GoGovSG/pull/2381)
1019
- build(deps-dev): bump @babel/traverse from 7.14.8 to 7.24.7 [`#2330`](https://github.com/opengovsg/GoGovSG/pull/2330)
1120
- chore: pipe test results to datadog [`#2342`](https://github.com/opengovsg/GoGovSG/pull/2342)

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ The official Singapore government link shortener.
3535

3636
## Introduction
3737

38-
GoGovSg is the official Singapore government link shortener, built by the [Open Government Products](https://open.gov.sg) team in [GovTech](https://tech.gov.sg). This repository serves as the codebase to serve three link shortener environments: [Go.gov.sg](https://www.go.gov.sg), [for.edu.sg](https://www.for.edu.sg), and [for.sg](https://www.for.sg).
38+
GoGovSG is the official Singapore government link shortener, built by the [Open Government Products](https://open.gov.sg) team in [GovTech](https://tech.gov.sg). This repository serves as the codebase to serve three link shortener environments: [Go.gov.sg](https://www.go.gov.sg), [for.edu.sg](https://www.for.edu.sg), and [for.sg](https://www.for.sg).
3939

4040
There are multiple reasons why we built an official government link shortener:
4141

4242
- URLs are **too long** to fit into tweets or SMSes, and **difficult to remember**
4343
- Email clients might block other commercial link shorteners if they are listed as **spam** on their site
4444
- Citizens are afraid of **phishing** when receiving a shortened link and unsure of where it goes
4545

46-
With GoGovSg, citizens are safe in the knowledge that the links are **official** and **safe**. Any authorized user can log in with their government emails and immediately create authenticated and recognisable short links.
46+
With GoGovSG, citizens are safe in the knowledge that the links are **official** and **safe**. Any authorized user can log in with their government emails and immediately create authenticated and recognisable short links.
4747

4848
## Getting Started
4949

@@ -97,7 +97,7 @@ After these have been set up, set the environment variables according to the tab
9797
#### Server
9898

9999
| Environment Variable | Required | Description/Value |
100-
| :--------------------------------: | :------: | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --- | --- |
100+
| :--------------------------------: | :------: | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
101101
| NODE_ENV | Yes | `production` |
102102
| DB_URI | Yes | The postgres connection string, e.g. `postgres://postgres:postgres@postgres:5432/postgres` |
103103
| OG_URL | Yes | The origin url, used for both google analytics and circular-redirect prevention. E.g. `https://go.gov.sg` |
@@ -147,8 +147,8 @@ After these have been set up, set the environment variables according to the tab
147147
| ADMIN_API_EMAILS | No | Emails with admin API access, separated by commas without spaces. Defaults to none. |
148148
| FF_USE_REPLICA_FOR_REDIRECTS | No | Boolean, feature flag for using the replica database to look up redirects to long URLs. Defaults to false |
149149
| USER_COUNT | No | Total count of registered users to display on landing page. Defaults to the data we pulled on April 2025 |
150-
| CLICK_COUNT | No | Total count of link clicks to display on landing page. Defaults to the data we pulled on April 2025 | |
151-
| LINK_COUNT | No | Total count of created links to display on landing page. Defaults to the data we pulled on April 2025 | | |
150+
| CLICK_COUNT | No | Total count of link clicks to display on landing page. Defaults to the data we pulled on April 2025 |
151+
| LINK_COUNT | No | Total count of created links to display on landing page. Defaults to the data we pulled on April 2025 |
152152

153153
#### Serverless functions for link migration
154154

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "GoGovSG",
3-
"version": "1.79.1",
3+
"version": "1.79.2",
44
"description": "Link shortener for Singapore government.",
55
"main": "src/server/index.js",
66
"scripts": {

0 commit comments

Comments
 (0)