Skip to content

Commit 7b40e50

Browse files
authored
1 parent 04912c2 commit 7b40e50

File tree

11 files changed

+76
-56
lines changed

11 files changed

+76
-56
lines changed

.github/workflows/compatibility.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,9 @@ jobs:
3131
3232
- name: Start TDengine
3333
run: |
34-
sudo mkdir -p /mnt/taos/data /mnt/taos/log
35-
sudo chown -R "$USER":"$(id -gn)" /mnt/taos
34+
mkdir -p /tmp/taos/log /tmp/taos/data
3635
taosd &
37-
TAOS_ADAPTER_LOG_PATH=/mnt/taos/log taosadapter &
36+
TAOS_ADAPTER_LOG_PATH=/tmp/taos/log taosadapter &
3837
3938
- name: Start Nginx
4039
run: |

.github/workflows/coverage.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,6 @@ jobs:
120120
runs-on: ubuntu-latest
121121
needs: build-tdengine
122122
steps:
123-
- name: Maximize build space
124-
uses: easimon/maximize-build-space@master
125-
with:
126-
root-reserve-mb: 10240
127-
temp-reserve-mb: 20480
128-
129123
- name: Get cache server by push
130124
if: github.event_name == 'push'
131125
id: get-cache-server-push
@@ -194,11 +188,9 @@ jobs:
194188
195189
- name: Start TDengine
196190
run: |
197-
sudo mkdir -p /mnt/taos/data /mnt/taos/log
198-
sudo chown -R "$USER":"$(id -gn)" /mnt/taos
191+
mkdir -p /tmp/taos/log /tmp/taos/data
199192
taosd &
200-
TAOS_ADAPTER_LOG_PATH=/mnt/taos/log taosadapter &
201-
sleep 1
193+
TAOS_ADAPTER_LOG_PATH=/tmp/taos/log taosadapter &
202194
203195
- name: Start Nginx
204196
run: |

.github/workflows/enterprise.yml

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@ jobs:
88
runs-on: ubuntu-latest
99
timeout-minutes: 30
1010
steps:
11-
- name: Maximize build space
12-
uses: easimon/maximize-build-space@master
13-
with:
14-
root-reserve-mb: 10240
15-
temp-reserve-mb: 20480
16-
1711
- name: Checkout
1812
uses: actions/checkout@v4
1913

@@ -37,10 +31,9 @@ jobs:
3731
3832
- name: Start TDengine
3933
run: |
40-
sudo mkdir -p /mnt/taos/data /mnt/taos/log
41-
sudo chown -R "$USER":"$(id -gn)" /mnt/taos
34+
mkdir -p /tmp/taos/log /tmp/taos/data
4235
taosd &
43-
TAOS_ADAPTER_LOG_PATH=/mnt/taos/log taosadapter &
36+
TAOS_ADAPTER_LOG_PATH=/tmp/taos/log taosadapter &
4437
4538
- name: Start Nginx
4639
run: |
@@ -104,12 +97,6 @@ jobs:
10497
runs-on: ubuntu-latest
10598
timeout-minutes: 30
10699
steps:
107-
- name: Maximize build space
108-
uses: easimon/maximize-build-space@master
109-
with:
110-
root-reserve-mb: 10240
111-
temp-reserve-mb: 20480
112-
113100
- name: Checkout
114101
uses: actions/checkout@v4
115102

@@ -133,10 +120,9 @@ jobs:
133120
134121
- name: Start TDengine
135122
run: |
136-
sudo mkdir -p /mnt/taos/data /mnt/taos/log
137-
sudo chown -R "$USER":"$(id -gn)" /mnt/taos
123+
mkdir -p /tmp/taos/log /tmp/taos/data
138124
taosd &
139-
TAOS_ADAPTER_LOG_PATH=/mnt/taos/log taosadapter &
125+
TAOS_ADAPTER_LOG_PATH=/tmp/taos/log taosadapter &
140126
141127
- name: Start Nginx
142128
run: |

.github/workflows/sbom.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: SBOM
2+
3+
on:
4+
pull_request:
5+
branches: ["main", "3.0"]
6+
release:
7+
types: [published]
8+
9+
jobs:
10+
sbom:
11+
name: Generate and Scan SBOM
12+
runs-on: ubuntu-latest
13+
permissions:
14+
actions: read
15+
contents: write
16+
env:
17+
SBOM_FILENAME: "${{ github.event.repository.name }}-sbom.cdx.json"
18+
steps:
19+
- uses: actions/checkout@v6
20+
21+
- name: Create SBOM
22+
uses: anchore/sbom-action@v0
23+
with:
24+
format: cyclonedx-json
25+
output-file: "${{ env.SBOM_FILENAME }}"
26+
artifact-name: "${{ env.SBOM_FILENAME }}"
27+
28+
- name: Scan SBOM
29+
uses: anchore/scan-action@v7
30+
with:
31+
sbom: "${{ env.SBOM_FILENAME }}"
32+
cache-db: true
33+
output-format: "table"

.github/workflows/taos.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
fqdn localhost
22
firstEp localhost:6030
33
supportVnodes 256
4-
dataDir /mnt/taos/data
5-
logDir /mnt/taos/log
4+
dataDir /tmp/taos/data
5+
logDir /tmp/taos/log

Cargo.lock

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

taos-optin/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ exclude = ["tests/", "examples", "docker-compose.yml"]
1515
[dependencies]
1616
anyhow = "1"
1717
async-trait = "0.1"
18-
bytes = "1.2"
18+
bytes = "1.11.1"
1919
cfg-if = "1.0.0"
2020
derive_more = { version = "1", features = [
2121
"deref",

taos-query/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ description.workspace = true
1212

1313
[dependencies]
1414
anyhow = "1"
15-
bytes = { version = "1.1", features = ["serde"] }
15+
bytes = { version = "1.11.1", features = ["serde"] }
1616
chrono = { version = "0.4", features = ["serde"] }
1717
chrono-tz = "0.10.4"
1818
derive_more = { version = "1", features = [

taos-ws-sys/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ crate-type = ["cdylib", "staticlib"]
1111

1212
[dependencies]
1313
anyhow = "1"
14-
bytes = "1.1.0"
14+
bytes = "1.11.1"
1515
byteorder = "1.5.0"
1616
cargo_metadata = "0.18.1"
1717
ctor = "0.2.9"

taos-ws/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ repository.workspace = true
1212
[dependencies]
1313
anyhow = "1"
1414
async-trait = { version = "0.1.80" }
15-
bytes = "1.1.0"
15+
bytes = "1.11.1"
1616
byteorder = "1.5.0"
1717
cfg-if = "1"
1818
chrono-tz = "0.10.4"

0 commit comments

Comments
 (0)