Skip to content

Commit 9b19596

Browse files
committed
Merge branch 'dev'
2 parents 300fe8b + 964b545 commit 9b19596

3 files changed

Lines changed: 15 additions & 10 deletions

File tree

.github/workflows/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@ jobs:
321321
./scripts/generate_release_notes.pl --html
322322
cd ..
323323
data=$(cat ./repo/release_notes | tr -d '\n')
324+
echo "First Print *appdata.xml file:"
324325
cat ./flatpak-repo/io.github.Figma_Linux.figma_linux.appdata.xml
325326
cat ./repo/release_notes
326327
prevVersion=$(cat ./flatpak-repo/io.github.Figma_Linux.figma_linux.appdata.xml | grep -Eo 'release\sversion=".*"\s' | tr -d '[a-z=" \s\n]')
@@ -339,7 +340,10 @@ jobs:
339340
cat ./flatpak-repo/io.github.Figma_Linux.figma_linux.appdata.xml
340341
cat ./flatpak-repo/io.github.Figma_Linux.figma_linux.appdata.xml | tr -d '\n' > /tmp/tmp1
341342
sed -i "s|<releases>|<releases><release version=\"$version\" date=\"$(date '+%Y-%m-%d')\"><description><ul>$data<\/ul><\/description>|g" /tmp/tmp1
343+
echo "Print before formatting /tmp/tmp1 xml file:"
344+
cat /tmp/tmp1
342345
xmllint --format /tmp/tmp1 > ./flatpak-repo/io.github.Figma_Linux.figma_linux.appdata.xml
346+
echo "Print after formatting /tmp/tmp1 xml file:"
343347
cat ./flatpak-repo/io.github.Figma_Linux.figma_linux.appdata.xml
344348
echo ::set-output name=release::$version
345349

docker/Build_ppa

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ RUN cat ./build/figma-linux-${FIGMA_LINUX_VERSION}/debian/changelog && \
2626
ls -lah ./build || echo '' && \
2727
ls -lah ./build/installers || echo '' && \
2828
ls -lah ./build/installers/linux-unpacked || echo '' && \
29-
ls -lah ./build/installers/linux-unpacked/installers || echo '' && \
30-
ls -lah ./build/installers/linux-unpacked/installers || echo '' && \
31-
ls -lah ./build/installers/linux-unpacked/installers/linux-unpacked || echo '' && \
3229
cd build/figma-linux-${FIGMA_LINUX_VERSION} && \
30+
ls -la . || echo '' && \
31+
ls -la installers || echo '' && \
32+
ls -la installers/linux-unpacked || echo '' && \
3333
chmod a+x debian/rules debian/postinst debian/postrm && \
3434
EDITOR=/bin/true dpkg-source -q --commit . patchsetname && \
3535
debuild -S -sa -p"gpg --batch --passphrase-file /usr/src/figma-linux/passphrase --pinentry-mode loopback" && \

src/package.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,17 @@
99
"license": "MIT",
1010
"dependencies": {
1111
"adm-zip": "^0.5.1",
12+
"cargo-cp-artifact": "^0.1.5",
1213
"chokidar": "^3.0.2",
13-
"electron-devtools-installer": "^2.2.4",
14-
"figma-linux-rust-binding": "=0.1.4",
14+
"css-vars": "^2.2.0",
1515
"electron-build-env": "^0.2",
16-
"electron-settings": "^4.0.2",
16+
"electron-devtools-installer": "^2.2.4",
17+
"figma-linux-rust-binding": "^0.2.7",
1718
"lodash": "^4.17.20",
18-
"mobx": "^5.0.3",
19-
"mobx-react": "^5.2.8",
20-
"react": "^16.5.2",
21-
"react-dom": "^16.5.2",
19+
"mobx": "^5.6.0",
20+
"mobx-react": "^5.4.2",
21+
"react": "^16.14.0",
22+
"react-dom": "^16.14.0",
2223
"source-map-support": "^0.5.6",
2324
"uuid": "^8.3.2"
2425
}

0 commit comments

Comments
 (0)