Skip to content

ci: merge staging to master #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 28, 2022
Merged

ci: merge staging to master #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
47ea298
docs: badges should be pointing to js-encryptedfs
CMCDragonkai Jul 28, 2022
01f44a1
3.5.4
CMCDragonkai Jul 28, 2022
ad2f42e
docs: update docs
CMCDragonkai Jul 28, 2022
a70d4c4
test: robustly check for write multiples in `EncryptedFS.write and En…
CMCDragonkai Jul 28, 2022
92efef0
3.5.5
CMCDragonkai Jul 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# js-encryptedfs

staging:[![pipeline status](https://gitlab.com/MatrixAI/open-source/js-workers/badges/staging/pipeline.svg)](https://gitlab.com/MatrixAI/open-source/js-workers/commits/staging)
master:[![pipeline status](https://gitlab.com/MatrixAI/open-source/js-workers/badges/master/pipeline.svg)](https://gitlab.com/MatrixAI/open-source/js-workers/commits/master)
staging:[![pipeline status](https://gitlab.com/MatrixAI/open-source/js-encryptedfs/badges/staging/pipeline.svg)](https://gitlab.com/MatrixAI/open-source/js-encryptedfs/commits/staging)
master:[![pipeline status](https://gitlab.com/MatrixAI/open-source/js-encryptedfs/badges/master/pipeline.svg)](https://gitlab.com/MatrixAI/open-source/js-encryptedfs/commits/master)

Encrypted filesystem library for TypeScript/JavaScript applications

Expand Down
4 changes: 2 additions & 2 deletions docs/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<a href="#js-encryptedfs" id="js-encryptedfs" style="color: inherit; text-decoration: none;">
<h1>js-encryptedfs</h1>
</a>
<p>staging:<a href="https://gitlab.com/MatrixAI/open-source/js-workers/commits/staging"><img src="https://gitlab.com/MatrixAI/open-source/js-workers/badges/staging/pipeline.svg" alt="pipeline status"></a>
master:<a href="https://gitlab.com/MatrixAI/open-source/js-workers/commits/master"><img src="https://gitlab.com/MatrixAI/open-source/js-workers/badges/master/pipeline.svg" alt="pipeline status"></a></p>
<p>staging:<a href="https://gitlab.com/MatrixAI/open-source/js-encryptedfs/commits/staging"><img src="https://gitlab.com/MatrixAI/open-source/js-encryptedfs/badges/staging/pipeline.svg" alt="pipeline status"></a>
master:<a href="https://gitlab.com/MatrixAI/open-source/js-encryptedfs/commits/master"><img src="https://gitlab.com/MatrixAI/open-source/js-encryptedfs/badges/master/pipeline.svg" alt="pipeline status"></a></p>
<p>Encrypted filesystem library for TypeScript/JavaScript applications</p>
<ul>
<li>Virtualised - files, directories, permissions are all virtual constructs, they do not correspond to real filesystems</li>
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "encryptedfs",
"version": "3.5.3",
"version": "3.5.5",
"author": "Matrix AI",
"contributors": [
{
Expand Down
16 changes: 5 additions & 11 deletions tests/EncryptedFS.concurrent.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1906,6 +1906,7 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
(async () => {
const writeStream = efs.createWriteStream(path1);
for (let i = 0; i < 10; i++) {
await sleep(50);
writeStream.write(dataA);
}
writeStream.end();
Expand All @@ -1919,17 +1920,10 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
{ status: 'fulfilled', value: undefined },
]);
stat = await efs.stat(path1);
contents = (await efs.readFile(path1)).toString();

if (contents[0] === 'A') {
expect(contents).toEqual(dataA.repeat(10));
expect(contents).toHaveLength(50);
expect(stat.size).toEqual(50);
} else {
expect(contents).toEqual(dataB + dataA.repeat(5));
expect(contents).toHaveLength(50);
expect(stat.size).toEqual(50);
}
contents = (await efs.readFile(path1, { encoding: 'utf-8' })) as string;
expect(stat.size).toEqual(50);
expect(contents).toHaveLength(50);
expect(contents).toMatch(/^(BBBBB){0,5}A+$/);
});
test('EncryptedFS.createReadStream and EncryptedFS.write', async () => {
const path1 = utils.pathJoin('dir', 'file1');
Expand Down