Skip to content
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

Jump to bottom

Fix missing placeholders for submodules #516

Merged
merged 2 commits into from
Feb 11, 2021
Merged

Fix missing placeholders for submodules #516

merged 2 commits into from
Feb 11, 2021

Conversation

proletarius101
Copy link
Contributor

The following submodules lack placeholders, which is problematic for many build procedures (e.g. Flatpak), and is not really legit, while others having their placeholders:

app/extensions/extensions-manager
vendor/extensions/extensions-manager

Related issue: flatpak/flatpak-builder-tools#182

@proletarius101 proletarius101 changed the title Fix missing placeholder for submodules Fix missing placeholders for submodules Jan 29, 2021
@proletarius101 proletarius101 mentioned this pull request Jan 29, 2021
Open
@JaspalSuri JaspalSuri requested a review from arielsvg January 30, 2021 09:25
@proletarius101
Copy link
Contributor Author

Hi @baptiste-grob, can you merge this PR which I think is a easy fix?

@arielsvg
Copy link
Contributor

Hey @proletarius101, sorry for the late response! Can you tell me what you mean by placeholders? The modules are already referenced in .gitmodules as far as I'm aware.

Also can you please remove the package-lock.json file as we actually use yarn 😅

@proletarius101
Copy link
Contributor Author

Also can you please remove the package-lock.json file as we actually use yarn sweat_smile

Oh sorry, that was a mistake. It was supposed to be my local experiment. Dropped that commit.

Can you tell me what you mean by placeholders? The modules are already referenced in .gitmodules as far as I'm aware.

A git submodule consists of two parts:

  • A record in .gitmodules
  • A placeholder file in the path of the modules, e.g. 
    $ git diff --cached DbConnector
diff --git a/DbConnector b/DbConnector
new file mode 160000
index 0000000..c3f01dc
--- /dev/null
+++ b/DbConnector
@@ -0,0 +1 @@
+Subproject commit c3f01dc8862123d317dd46284b05b6892c7b29bc
    You can read more about that here: https://git-scm.com/book/en/v2/Git-Tools-Submodules

@arielsvg
Copy link
Contributor

Ah okay, that makes sense, thank you for taking the time to explain that to me!

@arielsvg arielsvg merged commit 2cbc7a0 into standardnotes:develop Feb 11, 2021
arielsvg added a commit that referenced this pull request Mar 2, 2021
@arielsvg @dependabot
@proletarius101 @standarius
Release/3.6.0 (#527)
bef17ef 
* feat: (wip) authorize note access

* fix: remove multiEditorEnabled

* refactor: update SNJS + eslint

* refactor: remove privileges in favor of SNJS protections

* fix: do not close editor when editing an archived note

* chore: remove progress indicator for webpack dev server

* fix: add rel="noreferrer" to bugsnag links

* chore(deps): upgrade snjs

* chore(deps): upgrade snjs

* feat: batch manager protection + react challenge modal + eslint fix

* fix: lint errors

* fix: launch state error

* fix: challenge modal: cancel instead of dismiss when pressing escape

* feat: improve focus styles

* fix: cancel session revoking when pressing escape on confirm dialog

* fix: lint warning

* chore(deps): upgrade minor versions

* feat: make SNWebCrypto a constant

* feat: add random identifier to bugsnag reports

* fix: check onKeyUp instead of onKeyDown

* feat: implement SNJS backup file password retrieval

* chore(deps): upgrade snjs

* feat: display warning banner when using the app with no account

* fix: properly color svg button

* fix: wording

* fix: hide account warning after login + improve key storage wording

* chore(deps): upgrade stylekit

* feat: use stylekit fonts for the editor

* chore(deps): bump nokogiri from 1.10.8 to 1.11.1 (#511)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.8 to 1.11.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](sparklemotion/nokogiri@v1.10.8...v1.11.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Baptiste Grob <[email protected]>

* chore(deps): bump ini from 1.3.5 to 1.3.8 (#504)

Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.8.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](npm/ini@v1.3.5...v1.3.8)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Baptiste Grob <[email protected]>

* fix: rename master branch to main

* fix: add missing placeholders for submodules (#516)

Co-authored-by: Baptiste Grob <[email protected]>

* chore(deps): upgrade snjs, babel, typescript, reach, mobx, preact

* feat: clear protection session

* fix: use correct close icon size

* fix: hide protections paragraph when no account or passcode exist

* chore(deps): remove unused dependencies

* fix: button casing

* feat: implement SNApplication.hasProtectionSources

* chore(version): 3.6.0

* feat: enable sessions management for every build

* feat: make "Protected" flag more subtle

* fix: only match protected note title

* fix: remove inconsistencies between protected note label and date

* feat: show warning when protecting a note with no protection source

* feat: make unprotecting a note a protected action

* chore(deps): upgrade snjs

* chore(version): 3.6.0-beta01

* fix: run docker with root to fix crashing on Linux (undoes 62da387) (#525)

* feat: make encrypted backups protected (#524)

Co-authored-by: Baptiste Grob <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: proletarius101 <[email protected]>
Co-authored-by: Darius JJ Chuck <[email protected]>
Co-authored-by: Antonella Sgarlatta <[email protected]>
proletarius101 added a commit to proletarius101/glutin that referenced this pull request Feb 15, 2023
@proletarius101
fix: properly initialize the submodule
100cdd5 
According to https://git-scm.com/docs/gitsubmodules, there must be a working directory at `path/to/bar/` if there's a `submodule.foo.path = path/to/bar` entry in `.gitmodules`. Failure to have this will result in errors in certain build environments (e.g. Flatpak: standardnotes/app#516)
@proletarius101 proletarius101 mentioned this pull request Feb 15, 2023
Merged
4 tasks
proletarius101 added a commit to proletarius101/glutin that referenced this pull request Feb 16, 2023
@proletarius101
fix: remove unused error-prone submodule setup
a54a7d5 
According to https://git-scm.com/docs/gitsubmodules, there must be a working directory at path/to/bar/ if there's a submodule.foo.path = path/to/bar entry in .gitmodules. Failure to have this will result in errors in certain build environments (e.g. Flatpak: standardnotes/app#516)

Same as in rust-windowing#1575
@proletarius101 proletarius101 mentioned this pull request Feb 16, 2023
Open
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@arielsvg arielsvg arielsvg approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@proletarius101 @arielsvg