Skip to content

Commit e378539

Browse files
committed
Remove CI for the old syn2mas tool
1 parent 1d21b99 commit e378539

File tree

8 files changed

+2
-128
lines changed

8 files changed

+2
-128
lines changed

.dockerignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ crates/*/target
33
crates/*/node_modules
44
frontend/node_modules
55
frontend/dist
6-
tools/syn2mas/**
76
docs/
87
.devcontainer/
98
.github/

.github/dependabot.yml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -106,20 +106,3 @@ updates:
106106
browser-logos:
107107
patterns:
108108
- "@browser-logos/*"
109-
110-
- package-ecosystem: "npm"
111-
directory: "/tools/syn2mas/"
112-
labels:
113-
- "A-Dependencies"
114-
- "Z-Deps-Syn2Mas"
115-
schedule:
116-
interval: "weekly"
117-
ignore:
118-
# Ignore @types/node until we can upgrade to Node 20
119-
- dependency-name: "@types/node"
120-
update-types: ["version-update:semver-major"]
121-
groups:
122-
production:
123-
dependency-type: "production"
124-
development:
125-
dependency-type: "development"

.github/scripts/commit-and-tag.cjs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,7 @@ module.exports = async ({ github, context }) => {
1313
const parent = context.sha;
1414
if (!version) throw new Error("VERSION is not defined");
1515

16-
const files = [
17-
"Cargo.toml",
18-
"Cargo.lock",
19-
"tools/syn2mas/package.json",
20-
"tools/syn2mas/package-lock.json",
21-
];
16+
const files = ["Cargo.toml", "Cargo.lock"];
2217

2318
/** @type {{path: string, mode: "100644", type: "blob", sha: string}[]} */
2419
const tree = [];

.github/workflows/build.yaml

Lines changed: 0 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ env:
2323
SCCACHE_GHA_ENABLED: "true"
2424
RUSTC_WRAPPER: "sccache"
2525
IMAGE: ghcr.io/element-hq/matrix-authentication-service
26-
IMAGE_SYN2MAS: ghcr.io/element-hq/matrix-authentication-service/syn2mas
2726
BUILDCACHE: ghcr.io/element-hq/matrix-authentication-service/buildcache
2827
DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
2928

@@ -253,22 +252,6 @@ jobs:
253252
type=semver,pattern={{major}}
254253
type=sha
255254
256-
- name: Docker meta (syn2mas)
257-
id: meta-syn2mas
258-
uses: docker/[email protected]
259-
with:
260-
images: "${{ env.IMAGE_SYN2MAS }}"
261-
bake-target: docker-metadata-action-syn2mas
262-
flavor: |
263-
latest=auto
264-
tags: |
265-
type=ref,event=branch
266-
type=ref,event=pr
267-
type=semver,pattern={{version}}
268-
type=semver,pattern={{major}}.{{minor}}
269-
type=semver,pattern={{major}}
270-
type=sha
271-
272255
- name: Setup Cosign
273256
uses: sigstore/[email protected]
274257

@@ -294,7 +277,6 @@ jobs:
294277
./docker-bake.hcl
295278
cwd://${{ steps.meta.outputs.bake-file }}
296279
cwd://${{ steps.meta-debug.outputs.bake-file }}
297-
cwd://${{ steps.meta-syn2mas.outputs.bake-file }}
298280
set: |
299281
base.output=type=image,push=true
300282
base.cache-from=type=registry,ref=${{ env.BUILDCACHE }}:buildcache
@@ -318,43 +300,11 @@ jobs:
318300
env:
319301
REGULAR_DIGEST: ${{ steps.output.outputs.metadata && fromJSON(steps.output.outputs.metadata).regular.digest }}
320302
DEBUG_DIGEST: ${{ steps.output.outputs.metadata && fromJSON(steps.output.outputs.metadata).debug.digest }}
321-
SYN2MAS_DIGEST: ${{ steps.output.outputs.metadata && fromJSON(steps.output.outputs.metadata).syn2mas.digest }}
322303

323304
run: |-
324305
cosign sign --yes \
325306
"$IMAGE@$REGULAR_DIGEST" \
326307
"$IMAGE@$DEBUG_DIGEST" \
327-
"$IMAGE_SYN2MAS@$SYN2MAS_DIGEST"
328-
329-
syn2mas:
330-
name: Release syn2mas on NPM
331-
runs-on: ubuntu-24.04
332-
if: github.event_name != 'pull_request'
333-
334-
permissions:
335-
contents: read
336-
id-token: write
337-
338-
steps:
339-
- name: Checkout the code
340-
uses: actions/[email protected]
341-
342-
- name: Install Node
343-
uses: actions/[email protected]
344-
with:
345-
node-version-file: ./tools/syn2mas/.nvmrc
346-
347-
- name: Install Node dependencies
348-
working-directory: ./tools/syn2mas
349-
run: npm ci
350-
351-
- name: Publish
352-
uses: JS-DevTools/npm-publish@v3
353-
with:
354-
package: ./tools/syn2mas
355-
token: ${{ secrets.NPM_TOKEN }}
356-
provenance: true
357-
dry-run: ${{ !startsWith(github.ref, 'refs/tags/') }}
358308
359309
release:
360310
name: Release
@@ -363,7 +313,6 @@ jobs:
363313
needs:
364314
- assemble-archives
365315
- build-image
366-
- syn2mas
367316
steps:
368317
- name: Download the artifacts from the previous job
369318
uses: actions/download-artifact@v4
@@ -403,18 +352,6 @@ jobs:
403352
') }}
404353
```
405354
406-
`syn2mas` migration tool:
407-
408-
- Digest:
409-
```
410-
${{ env.IMAGE_SYN2MAS }}@${{ fromJSON(needs.build-image.outputs.metadata).syn2mas.digest }}
411-
```
412-
- Tags:
413-
```
414-
${{ join(fromJSON(needs.build-image.outputs.metadata).syn2mas.tags, '
415-
') }}
416-
```
417-
418355
files: |
419356
artifacts/mas-cli-aarch64-linux.tar.gz
420357
artifacts/mas-cli-x86_64-linux.tar.gz

.github/workflows/ci.yaml

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -311,34 +311,6 @@ jobs:
311311
--archive-file nextest-archive.tar.zst \
312312
--partition count:${{ matrix.partition }}/3
313313
314-
syn2mas:
315-
name: Check syn2mas
316-
runs-on: ubuntu-24.04
317-
318-
permissions:
319-
contents: read
320-
321-
steps:
322-
- name: Checkout the code
323-
uses: actions/[email protected]
324-
325-
- name: Install Node
326-
uses: actions/[email protected]
327-
with:
328-
node-version-file: ./tools/syn2mas/.nvmrc
329-
330-
- name: Install Node dependencies
331-
working-directory: ./tools/syn2mas
332-
run: npm ci
333-
334-
- name: Lint
335-
working-directory: ./tools/syn2mas
336-
run: npm run lint
337-
338-
- name: Build
339-
working-directory: ./tools/syn2mas
340-
run: npm run build
341-
342314
tests-done:
343315
name: Tests done
344316
if: ${{ always() }}
@@ -352,7 +324,6 @@ jobs:
352324
- clippy
353325
- check-schema
354326
- test
355-
- syn2mas
356327
runs-on: ubuntu-24.04
357328

358329
steps:

.github/workflows/tag.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ jobs:
4040
- name: Run `cargo metadata` to make sure the lockfile is up to date
4141
run: cargo metadata --format-version 1
4242

43-
- name: Set the tools/syn2mas version
44-
working-directory: tools/syn2mas
45-
run: npm version "${{ inputs.version }}" --no-git-tag-version
46-
4743
- name: Commit and tag using the GitHub API
4844
uses: actions/[email protected]
4945
id: commit

biome.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
"frontend/.storybook/locales.ts",
2222
"frontend/.storybook/public/mockServiceWorker.js",
2323
"frontend/locales/*.json",
24-
"tools/syn2mas/package.json",
2524
"**/coverage/**",
2625
"**/dist/**"
2726
]

docker-bake.hcl

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@
44
variable "VERGEN_GIT_DESCRIBE" {}
55

66
// This is what is baked by GitHub Actions
7-
group "default" { targets = ["regular", "debug", "syn2mas"] }
7+
group "default" { targets = ["regular", "debug"] }
88

99
// Targets filled by GitHub Actions: one for the regular tag, one for the debug tag
1010
target "docker-metadata-action" {}
1111
target "docker-metadata-action-debug" {}
12-
target "docker-metadata-action-syn2mas" {}
1312

1413
// This sets the platforms and is further extended by GitHub Actions to set the
1514
// output and the cache locations
@@ -37,8 +36,3 @@ target "debug" {
3736
inherits = ["base", "docker-metadata-action-debug"]
3837
target = "debug"
3938
}
40-
41-
target "syn2mas" {
42-
inherits = ["base", "docker-metadata-action-syn2mas"]
43-
context = "./tools/syn2mas"
44-
}

0 commit comments

Comments
 (0)