diff options
-rw-r--r-- | .azure-pipelines.yml | 16 | ||||
-rwxr-xr-x | .ci/azure-pipelines/assertNoTranslationChanges.sh (renamed from scripts/azure-pipelines/assertNoTranslationChanges.sh) | 4 | ||||
-rwxr-xr-x | .ci/azure-pipelines/build_linux.bash (renamed from scripts/azure-pipelines/build_linux.bash) | 0 | ||||
-rwxr-xr-x | .ci/azure-pipelines/build_macos.bash (renamed from scripts/azure-pipelines/build_macos.bash) | 0 | ||||
-rw-r--r-- | .ci/azure-pipelines/build_windows.bat (renamed from scripts/azure-pipelines/build_windows.bat) | 0 | ||||
-rwxr-xr-x | .ci/azure-pipelines/install-environment_linux.bash (renamed from scripts/azure-pipelines/install-environment_linux.bash) | 0 | ||||
-rwxr-xr-x | .ci/azure-pipelines/install-environment_linux_translations.bash (renamed from scripts/azure-pipelines/install-environment_linux_translations.bash) | 0 | ||||
-rwxr-xr-x | .ci/azure-pipelines/install-environment_macos.bash (renamed from scripts/azure-pipelines/install-environment_macos.bash) | 0 | ||||
-rw-r--r-- | .ci/azure-pipelines/install-environment_windows.ps1 (renamed from scripts/azure-pipelines/install-environment_windows.ps1) | 0 | ||||
-rwxr-xr-x | .ci/travis-ci/before_install.bash (renamed from scripts/travis-ci/before_install.bash) | 0 | ||||
-rwxr-xr-x | .ci/travis-ci/script.bash (renamed from scripts/travis-ci/script.bash) | 0 | ||||
-rw-r--r-- | .travis.yml | 4 |
12 files changed, 12 insertions, 12 deletions
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index e7626cf56..8607a3384 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -18,9 +18,9 @@ jobs: key: '"$(MUMBLE_ENVIRONMENT_VERSION)"' path: '$(MUMBLE_ENVIRONMENT_PATH)' displayName: 'Environment storage' - - powershell: scripts/azure-pipelines/install-environment_windows.ps1 + - powershell: .ci/azure-pipelines/install-environment_windows.ps1 displayName: 'Install build environment' - - script: scripts/azure-pipelines/build_windows.bat + - script: .ci/azure-pipelines/build_windows.bat displayName: 'Build' - powershell: | cd $(Build.BinariesDirectory) @@ -39,9 +39,9 @@ jobs: steps: - script: git submodule --quiet update --init --recursive displayName: 'Fetch submodules' - - script: scripts/azure-pipelines/install-environment_linux.bash + - script: .ci/azure-pipelines/install-environment_linux.bash displayName: 'Install build environment' - - script: scripts/azure-pipelines/build_linux.bash + - script: .ci/azure-pipelines/build_linux.bash displayName: 'Build' - task: PublishBuildArtifacts@1 inputs: @@ -60,9 +60,9 @@ jobs: key: '"$(MUMBLE_ENVIRONMENT_VERSION)"' path: '$(MUMBLE_ENVIRONMENT_PATH)' displayName: 'Environment storage' - - script: scripts/azure-pipelines/install-environment_macos.bash + - script: .ci/azure-pipelines/install-environment_macos.bash displayName: 'Install build environment' - - script: scripts/azure-pipelines/build_macos.bash + - script: .ci/azure-pipelines/build_macos.bash displayName: 'Build' - task: PublishBuildArtifacts@1 inputs: @@ -72,7 +72,7 @@ jobs: pool: vmImage: 'ubuntu-latest' steps: - - script: scripts/azure-pipelines/install-environment_linux_translations.bash + - script: .ci/azure-pipelines/install-environment_linux_translations.bash displayName: 'Install Qt tools' - - script: scripts/azure-pipelines/assertNoTranslationChanges.sh + - script: .ci/azure-pipelines/assertNoTranslationChanges.sh displayName: 'Checking for translation changes' diff --git a/scripts/azure-pipelines/assertNoTranslationChanges.sh b/.ci/azure-pipelines/assertNoTranslationChanges.sh index 34ec2b3d9..61aee535c 100755 --- a/scripts/azure-pipelines/assertNoTranslationChanges.sh +++ b/.ci/azure-pipelines/assertNoTranslationChanges.sh @@ -8,7 +8,7 @@ set -e # Get path to the updatetranslations script -updateScript="`dirname $0`/../updatetranslations.sh" +updateScript="$BUILD_SOURCESDIRECTORY/scripts/updatetranslations.sh" # Get current commit hash oldHash=`git rev-parse HEAD` @@ -18,7 +18,7 @@ git config user.name "CI" git config user.email "ci@mumble.info" # Execute updatetranslations that'll commit any translation changes -"./$updateScript" > /dev/null +$updateScript > /dev/null echo # Ger new commit hash diff --git a/scripts/azure-pipelines/build_linux.bash b/.ci/azure-pipelines/build_linux.bash index dc0e72bac..dc0e72bac 100755 --- a/scripts/azure-pipelines/build_linux.bash +++ b/.ci/azure-pipelines/build_linux.bash diff --git a/scripts/azure-pipelines/build_macos.bash b/.ci/azure-pipelines/build_macos.bash index f05256837..f05256837 100755 --- a/scripts/azure-pipelines/build_macos.bash +++ b/.ci/azure-pipelines/build_macos.bash diff --git a/scripts/azure-pipelines/build_windows.bat b/.ci/azure-pipelines/build_windows.bat index d9e2eb03a..d9e2eb03a 100644 --- a/scripts/azure-pipelines/build_windows.bat +++ b/.ci/azure-pipelines/build_windows.bat diff --git a/scripts/azure-pipelines/install-environment_linux.bash b/.ci/azure-pipelines/install-environment_linux.bash index 05fc4c6c5..05fc4c6c5 100755 --- a/scripts/azure-pipelines/install-environment_linux.bash +++ b/.ci/azure-pipelines/install-environment_linux.bash diff --git a/scripts/azure-pipelines/install-environment_linux_translations.bash b/.ci/azure-pipelines/install-environment_linux_translations.bash index bcd162cb5..bcd162cb5 100755 --- a/scripts/azure-pipelines/install-environment_linux_translations.bash +++ b/.ci/azure-pipelines/install-environment_linux_translations.bash diff --git a/scripts/azure-pipelines/install-environment_macos.bash b/.ci/azure-pipelines/install-environment_macos.bash index 944e8da2e..944e8da2e 100755 --- a/scripts/azure-pipelines/install-environment_macos.bash +++ b/.ci/azure-pipelines/install-environment_macos.bash diff --git a/scripts/azure-pipelines/install-environment_windows.ps1 b/.ci/azure-pipelines/install-environment_windows.ps1 index 0cd923849..0cd923849 100644 --- a/scripts/azure-pipelines/install-environment_windows.ps1 +++ b/.ci/azure-pipelines/install-environment_windows.ps1 diff --git a/scripts/travis-ci/before_install.bash b/.ci/travis-ci/before_install.bash index 3c0719f35..3c0719f35 100755 --- a/scripts/travis-ci/before_install.bash +++ b/.ci/travis-ci/before_install.bash diff --git a/scripts/travis-ci/script.bash b/.ci/travis-ci/script.bash index 9e09f389d..9e09f389d 100755 --- a/scripts/travis-ci/script.bash +++ b/.ci/travis-ci/script.bash diff --git a/.travis.yml b/.travis.yml index e9b57b31c..45b65ec40 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ jobs: - $HOME/mxe before_install: - - ./scripts/travis-ci/before_install.bash + - .ci/travis-ci/before_install.bash script: - - ./scripts/travis-ci/script.bash + - .ci/travis-ci/script.bash |