-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/main' into cpp/various-fixes
- Loading branch information
Showing
46 changed files
with
2,926 additions
and
1,092 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,7 @@ on: | |
| push: | ||
| branches: | ||
| - main | ||
| - phpdev-* | ||
| paths: | ||
| - "php/**" | ||
| - ".github/workflows/ci-php.yaml" | ||
|
|
@@ -129,8 +130,14 @@ jobs: | |
| echo "RELEASE_VERSION=${GITHUB_REF#refs/*/php}" >> $GITHUB_ENV | ||
| echo $RELEASE_VERSION | ||
| - name: extract version | ||
| if: startsWith(github.ref, 'refs/heads/phpdev-') | ||
| run: | | ||
| echo "RELEASE_VERSION=${GITHUB_REF#refs/*/phpdev-}" >> $GITHUB_ENV | ||
| echo $RELEASE_VERSION | ||
| - name: checkout | ||
| if: startsWith(github.ref, 'refs/tags/php') | ||
| if: startsWith(github.ref, 'refs/tags/php') || startsWith(github.ref, 'refs/heads/phpdev-') | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: publish on site repo | ||
|
|
@@ -151,8 +158,25 @@ jobs: | |
| git remote add origin https://ata-no-one:[email protected]/GDATASoftwareAG/vaas-php | ||
| git push origin main --tags --force | ||
| - name: publish on site repo | ||
| if: startsWith(github.ref, 'refs/heads/phpdev-') | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }} | ||
| working-directory: php/src/vaas | ||
| run: | | ||
| git config --global user.email "[email protected]" | ||
| git config --global user.name "Version Bot" | ||
| sed -i "s/\"version\": \"[0-9]\+\.[0-9]\+\.[0-9]\+\"/\"version\": \"$RELEASE_VERSION\"/g" ./composer.json | ||
| cp ../../../Readme.md . | ||
| git init | ||
| git add . | ||
| git commit -m"publish php $RELEASE_VERSION" | ||
| git branch -M $RELEASE_VERSION | ||
| git remote add origin https://ata-no-one:[email protected]/GDATASoftwareAG/vaas-php | ||
| git push origin $RELEASE_VERSION --force | ||
| - name: sync packagist | ||
| if: startsWith(github.ref, 'refs/tags/php') | ||
| if: startsWith(github.ref, 'refs/tags/php') || startsWith(github.ref, 'refs/heads/phpdev-') | ||
| env: | ||
| PACKAGIST_API_TOKEN: ${{ secrets.PACKAGIST_API_TOKEN }} | ||
| run: curl -XPOST -H'content-type:application/json' "https://packagist.org/api/update-package?username=gdatacyberdefense&apiToken=$PACKAGIST_API_TOKEN" -d'{"repository":{"url":"https://packagist.org/packages/gdata/vaas"}}' | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -53,5 +53,7 @@ _trial_temp*/ | |
| ruby/.idea | ||
| ruby/Gemfile.lock | ||
| ruby/test/test.txt | ||
| ruby/**/*.gem | ||
|
|
||
| *.env* | ||
|
|
||
| .env* | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| /* | ||
| * Very simple dotenv implementation in C++, | ||
| * specifically for the use case of running tests in this repository. | ||
| * | ||
| * It tries to read `.env` file in the current directory or a custom file. | ||
| * If no file is found, no error is thrown, instead the environment variable | ||
| * is expected to be set in the environment. | ||
| * | ||
| * If both the file and the environment variable are set, the environment variable | ||
| * takes precedence. | ||
| */ | ||
|
|
||
| #ifndef DOTENV_H | ||
| #define DOTENV_H | ||
|
|
||
| #include <algorithm> | ||
| #include <exception> | ||
| #include <filesystem> | ||
| #include <fstream> | ||
| #include <map> | ||
| #include <stdexcept> | ||
| #include <string> | ||
|
|
||
| namespace dotenv { | ||
|
|
||
| class Dotenv { | ||
| private: | ||
| std::string envFile; | ||
| std::map<std::string, std::string> envFromFile; | ||
|
|
||
| std::map<std::string, std::string> readEnvFromFile() { | ||
| std::map<std::string, std::string> env; | ||
| std::ifstream file(envFile); | ||
| char charsToRemove[] = {'"', '\''}; | ||
|
|
||
| if (!file) { | ||
| return env; | ||
| } | ||
|
|
||
| for (std::string line; std::getline(file, line);) { | ||
| const auto pos = line.find('='); | ||
| if (pos != std::string::npos) { | ||
| const auto key = line.substr(0, pos); | ||
| auto value = line.substr(pos + 1); | ||
|
|
||
| removeCharsFromString(value, charsToRemove); | ||
|
|
||
| env[key] = value; | ||
| } | ||
| } | ||
|
|
||
| return env; | ||
| } | ||
|
|
||
| static void removeCharsFromString(std::string& str, char* charsToRemove) { | ||
| for (unsigned int i = 0; i < sizeof(charsToRemove); ++i) { | ||
| str.erase(remove(str.begin(), str.end(), charsToRemove[i]), str.end()); | ||
| } | ||
| } | ||
|
|
||
| public: | ||
| Dotenv() : Dotenv(".env") {} | ||
|
|
||
| Dotenv(const std::string& envFile) : envFile(envFile) { | ||
| this->envFromFile = readEnvFromFile(); | ||
| } | ||
|
|
||
| std::string get(const std::string& key) { | ||
| if (std::getenv(key.c_str())) { | ||
| return std::string(std::getenv(key.c_str())); | ||
| } | ||
|
|
||
| if (envFromFile.find(key) != envFromFile.end()) { | ||
| return envFromFile[key]; | ||
| } | ||
|
|
||
| throw std::runtime_error(key + " must be set"); | ||
| } | ||
| }; | ||
|
|
||
| } // namespace dotenv | ||
| #endif // !DOTENV_H |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.