Skip to content

Commit 5848c2a

Browse files
authored
Use tcmalloc to help with fragmentation (#1059)
* Use tcmalloc to help with fragmentation * Add to CI setups * Add to CI setups * Update to Ubuntu 24.04
1 parent 4dfabb6 commit 5848c2a

File tree

13 files changed

+21
-21
lines changed

13 files changed

+21
-21
lines changed

.cirrus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ task:
1313
BOOTSTRAP_HASKELL_INSTALL_NO_STACK: 1
1414

1515
deps_install_script: |
16-
pkg install -y gmake bash libsodium curl git postgresql17-client
16+
pkg install -y gmake bash libsodium curl git postgresql17-client google-perftools pkgconf
1717
curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh
1818
echo $PATH
1919

.github/workflows/backend.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ concurrency:
1212
jobs:
1313
generateMatrix:
1414
name: "Generate matrix from cabal"
15-
runs-on: ubuntu-22.04
15+
runs-on: ubuntu-24.04
1616
outputs:
1717
matrix: ${{ steps.set-matrix.outputs.matrix }}
1818
steps:
@@ -21,7 +21,7 @@ jobs:
2121
uses: kleidukos/get-tested@v0.1.9.1
2222
with:
2323
cabal-file: flora.cabal
24-
ubuntu-version: "22.04"
24+
ubuntu-version: "24.04"
2525
version: 0.1.7.1
2626

2727
Backend_tests:
@@ -57,13 +57,11 @@ jobs:
5757
- name: Configure environment
5858
run: |
5959
./.github/workflows/setup.sh
60-
echo "/usr/lib/postgresql/14/bin/" >> $GITHUB_PATH
6160
echo "$HOME/.ghcup/bin" >> $GITHUB_PATH
6261
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
6362
echo "$HOME/.local/bin" >> $GITHUB_PATH
6463
echo "$HOME/node_modules/.bin" >> $GITHUB_PATH
6564
echo "STORE_PATH=$(cabal -v0 path --store-dir)" >> $GITHUB_ENV
66-
sudo apt install libsodium-dev
6765
source ./environment.ci.sh
6866
touch ~/.pgpass
6967
chmod 0600 ~/.pgpass

.github/workflows/changelog.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
- synchronize
66
jobs:
77
lint-changelog:
8-
runs-on: ubuntu-22.04
8+
runs-on: ubuntu-24.04
99
steps:
1010
- name: Checkout code
1111
uses: "actions/checkout@v6"

.github/workflows/docker-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010

1111
jobs:
1212
publish-hello-docker-image:
13-
runs-on: ubuntu-22.04
13+
runs-on: ubuntu-24.04
1414
steps:
1515
- uses: actions/checkout@v6
1616

.github/workflows/duplicate-indexes.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ concurrency:
1212
jobs:
1313
generateMatrix:
1414
name: "Generate matrix from cabal"
15-
runs-on: ubuntu-22.04
15+
runs-on: ubuntu-24.04
1616
outputs:
1717
matrix: ${{ steps.set-matrix.outputs.matrix }}
1818
steps:
@@ -21,7 +21,7 @@ jobs:
2121
uses: kleidukos/get-tested@v0.1.9.1
2222
with:
2323
cabal-file: flora.cabal
24-
ubuntu-version: "22.04"
24+
ubuntu-version: "24.04"
2525
version: 0.1.7.1
2626

2727
duplicate-index-check:
@@ -59,12 +59,10 @@ jobs:
5959
- name: Configure environment
6060
run: |
6161
./.github/workflows/setup.sh
62-
echo "/usr/lib/postgresql/14/bin/" >> $GITHUB_PATH
6362
echo "$HOME/.ghcup/bin" >> $GITHUB_PATH
6463
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
6564
echo "$HOME/.local/bin" >> $GITHUB_PATH
6665
echo "$HOME/node_modules/.bin" >> $GITHUB_PATH
67-
sudo apt install libsodium-dev
6866
source ./environment.ci.sh
6967
touch ~/.pgpass
7068
chmod 0600 ~/.pgpass

.github/workflows/frontend.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
Frontend_tests:
10-
runs-on: ubuntu-22.04
10+
runs-on: ubuntu-24.04
1111
steps:
1212
- uses: actions/checkout@v6
1313

.github/workflows/linting.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
fourmolu:
10-
runs-on: ubuntu-22.04
10+
runs-on: ubuntu-24.04
1111
steps:
1212
- uses: actions/checkout@v6
1313

@@ -20,7 +20,7 @@ jobs:
2020
app/**/*.hs
2121
2222
hlint:
23-
runs-on: ubuntu-22.04
23+
runs-on: ubuntu-24.04
2424
steps:
2525
- uses: actions/checkout@v6
2626

.github/workflows/missing-fk-indexes.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ concurrency:
1212
jobs:
1313
generateMatrix:
1414
name: "Generate matrix from cabal"
15-
runs-on: ubuntu-22.04
15+
runs-on: ubuntu-24.04
1616
outputs:
1717
matrix: ${{ steps.set-matrix.outputs.matrix }}
1818
steps:
@@ -21,7 +21,7 @@ jobs:
2121
uses: kleidukos/get-tested@v0.1.9.1
2222
with:
2323
cabal-file: flora.cabal
24-
ubuntu-version: "22.04"
24+
ubuntu-version: "24.04"
2525
version: 0.1.7.1
2626

2727
missing-fk-index-check:
@@ -64,7 +64,6 @@ jobs:
6464
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
6565
echo "$HOME/.local/bin" >> $GITHUB_PATH
6666
echo "$HOME/node_modules/.bin" >> $GITHUB_PATH
67-
sudo apt install libsodium-dev
6867
source ./environment.ci.sh
6968
touch ~/.pgpass
7069
chmod 0600 ~/.pgpass

.github/workflows/setup.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
44
wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
55
sudo apt -y update
6-
sudo apt -y install postgresql-16 g++ mcpp libffi7 llvm zlib1g-dev
6+
sudo apt -y upgrade
7+
sudo apt -y install postgresql-17 g++ mcpp libffi8 llvm zlib1g-dev libsodium-dev libgoogle-perftools-dev

.github/workflows/test-docker-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010

1111
jobs:
1212
build:
13-
runs-on: ubuntu-22.04
13+
runs-on: ubuntu-24.04
1414
steps:
1515
- name: Delete huge unnecessary tools folder
1616
run: rm -rf /opt/hostedtoolcache

0 commit comments

Comments
 (0)