forked from ClarifiedSecurity/catapult
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'ClarifiedSecurity:main' into main
- Loading branch information
Showing
42 changed files
with
1,947 additions
and
1,206 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
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 |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| name: Adding new git tag and release | ||
| --- | ||
| name: Adding a new version, tag & release | ||
|
|
||
| on: | ||
| push: | ||
|
|
@@ -9,41 +10,42 @@ on: | |
| workflow_dispatch: | ||
|
|
||
| jobs: | ||
| version_collection_and_tag: | ||
| version_tag_and_release: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - name: Checkout code | ||
| uses: actions/checkout@v2 | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| fetch-depth: 0 | ||
|
|
||
| - name: Configuring collection & tag versions | ||
| run: | | ||
| target_file="version.yml" | ||
| # Setting variables | ||
| version_file="${{ vars.PROJECT_VERSION_FILE }}" | ||
| # Configuring git | ||
| git config --global user.name "Catapult CI" | ||
| git config --global user.email "[email protected]" | ||
| git config --global user.name "${{ vars.PROJECT_CI_USERNAME }}" | ||
| git config --global user.email "${{ vars.PROJECT_CI_EMAIL }}" | ||
| # Updating the version in the galaxy.yml file | ||
| version_row_old=$(grep "version: " $target_file) | ||
| # Updating the version | ||
| version_row_old=$(grep "version: " $version_file) | ||
| version=$(echo $version_row_old | cut -d: -f2) | ||
| major=$(echo $version | cut -d. -f1) | ||
| minor=$(echo $version | cut -d. -f2) | ||
| patch=$(echo $version | cut -d. -f3) | ||
| patch_new=$(( $patch+1 )) | ||
| version_row_new="version: $major.$minor.$patch_new" | ||
| sed -i "s/$version_row_old/$version_row_new/" $target_file | ||
| sed -i "s/$version_row_old/$version_row_new/" $version_file | ||
| TAG_NAME="v$major.$minor.$patch_new" | ||
| echo "LATEST_TAG=$TAG_NAME" >> $GITHUB_ENV | ||
| # Adding the changed file to git | ||
| git add $target_file | ||
| git add $version_file | ||
| # Committing the change | ||
| git commit -m "Set Catapult version to $major.$minor.$patch_new" | ||
| git commit -m "Set ${{ vars.PROJECT_NAME }} version to $major.$minor.$patch_new" | ||
| git push | ||
| # Tagging and pushing the change | ||
|
|
||
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
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 |
|---|---|---|
| @@ -1,8 +1,7 @@ | ||
| --- | ||
| # You can use this file to run ansible-lint inside the container against roles with: | ||
| # ansible-lint --write -c /srv/ansible-lint.yml /path/to/role | ||
| # ansible-lint --fix -c /srv/ansible-lint.yml /path/to/role | ||
| skip_list: # https://ansible-lint.readthedocs.io/rules/ | ||
| - yaml[line-length] | ||
| - name[template] | ||
| - meta-no-info | ||
| - role-name[path] |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,104 +1,19 @@ | ||
| # If you come from bash you might have to change your $PATH. | ||
| # export PATH=$HOME/bin:/usr/local/bin:$PATH | ||
|
|
||
| # Path to your oh-my-zsh installation. | ||
| export ZSH="/home/builder/.oh-my-zsh" | ||
|
|
||
| # Set name of the theme to load --- if set to "random", it will | ||
| # load a random theme each time oh-my-zsh is loaded, in which case, | ||
| # to know which specific one was loaded, run: echo $RANDOM_THEME | ||
| # See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes | ||
| # Theme | ||
| ZSH_THEME="spaceship" | ||
|
|
||
| # Set list of themes to pick from when loading at random | ||
| # Setting this variable when ZSH_THEME=random will cause zsh to load | ||
| # a theme from this variable instead of looking in $ZSH/themes/ | ||
| # If set to an empty array, this variable will have no effect. | ||
| # ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" ) | ||
|
|
||
| # Uncomment the following line to use case-sensitive completion. | ||
| # CASE_SENSITIVE="true" | ||
|
|
||
| # Uncomment the following line to use hyphen-insensitive completion. | ||
| # Case-sensitive completion must be off. _ and - will be interchangeable. | ||
| # HYPHEN_INSENSITIVE="true" | ||
|
|
||
| # Uncomment the following line to disable bi-weekly auto-update checks. | ||
| # DISABLE_AUTO_UPDATE="true" | ||
|
|
||
| # Uncomment the following line to automatically update without prompting. | ||
| # DISABLE_UPDATE_PROMPT="true" | ||
|
|
||
| # Uncomment the following line to change how often to auto-update (in days). | ||
| # export UPDATE_ZSH_DAYS=13 | ||
|
|
||
| # Uncomment the following line if pasting URLs and other text is messed up. | ||
| # DISABLE_MAGIC_FUNCTIONS="true" | ||
|
|
||
| # Uncomment the following line to disable colors in ls. | ||
| # DISABLE_LS_COLORS="true" | ||
|
|
||
| # Uncomment the following line to disable auto-setting terminal title. | ||
| # DISABLE_AUTO_TITLE="true" | ||
|
|
||
| # Uncomment the following line to enable command auto-correction. | ||
| # ENABLE_CORRECTION="true" | ||
|
|
||
| # Uncomment the following line to display red dots whilst waiting for completion. | ||
| # COMPLETION_WAITING_DOTS="true" | ||
|
|
||
| # Uncomment the following line if you want to disable marking untracked files | ||
| # under VCS as dirty. This makes repository status check for large repositories | ||
| # much, much faster. | ||
| # DISABLE_UNTRACKED_FILES_DIRTY="true" | ||
|
|
||
| # Uncomment the following line if you want to change the command execution time | ||
| # stamp shown in the history command output. | ||
| # You can set one of the optional three formats: | ||
| # "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" | ||
| # or set a custom format using the strftime function format specifications, | ||
| # see 'man strftime' for details. | ||
| # HIST_STAMPS="mm/dd/yyyy" | ||
|
|
||
| # Would you like to use another custom folder than $ZSH/custom? | ||
| # ZSH_CUSTOM=/path/to/new-custom-folder | ||
|
|
||
| # Which plugins would you like to load? | ||
| # Standard plugins can be found in $ZSH/plugins/ | ||
| # Custom plugins may be added to $ZSH_CUSTOM/plugins/ | ||
| # Example format: plugins=(rails git textmate ruby lighthouse) | ||
| # Add wisely, as too many plugins slow down shell startup. | ||
| # Plugins | ||
| plugins=(git poetry) | ||
|
|
||
| # Sourcing oh-my-zsh | ||
| source $ZSH/oh-my-zsh.sh | ||
|
|
||
| # User configuration | ||
|
|
||
| # export MANPATH="/usr/local/man:$MANPATH" | ||
|
|
||
| # You may need to manually set your language environment | ||
| # export LANG=en_US.UTF-8 | ||
|
|
||
| # Preferred editor for local and remote sessions | ||
| # if [[ -n $SSH_CONNECTION ]]; then | ||
| # export EDITOR='vim' | ||
| # else | ||
| # export EDITOR='mvim' | ||
| # fi | ||
|
|
||
| # Compilation flags | ||
| # export ARCHFLAGS="-arch x86_64" | ||
|
|
||
| # Set personal aliases, overriding those provided by oh-my-zsh libs, | ||
| # plugins, and themes. Aliases can be placed here, though oh-my-zsh | ||
| # users are encouraged to define aliases within the ZSH_CUSTOM folder. | ||
| # For a full list of active aliases, run `alias`. | ||
| # | ||
| # Example aliases | ||
| # alias zshconfig="mate ~/.zshrc" | ||
| # alias ohmyzsh="mate ~/.oh-my-zsh" | ||
|
|
||
| # Loading fzf extension if it exists | ||
| # Including better history | ||
| if [ -f ~/.fzf.zsh ]; then | ||
| . ~/.fzf.zsh | ||
| fi | ||
| fi | ||
|
|
||
| # Disabling globbing | ||
| unsetopt glob |
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,11 @@ | ||
| --- | ||
| name: ${CONTAINER_PROJECT_NAME} | ||
| services: | ||
| catapult: | ||
| environment: | ||
| CATAPULT_NETWORK: bridge | ||
|
|
||
| networks: | ||
| default: | ||
| name: ${CONTAINER_NETWORK} | ||
| external: true # External becuase when compose creates the network the container does not have an IPv6 address |
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,7 @@ | ||
| --- | ||
| name: ${CONTAINER_PROJECT_NAME} | ||
| services: | ||
| catapult: | ||
| network_mode: host | ||
| environment: | ||
| CATAPULT_NETWORK: host |
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,7 @@ | ||
| --- | ||
| # This is a place holder for until everyone has ran ./install.sh | ||
| name: ${CONTAINER_PROJECT_NAME} | ||
| services: | ||
| catapult: | ||
| environment: | ||
| CATAPULT_PLACEHOLDER: CATAPULT_PLACEHOLDER |
Oops, something went wrong.