File tree Expand file tree Collapse file tree 7 files changed +10
-10
lines changed
Expand file tree Collapse file tree 7 files changed +10
-10
lines changed Original file line number Diff line number Diff line change @@ -17,4 +17,4 @@ compile_rust.sh @Datadog/libdatadog-apm
1717# Release files
1818Cargo.lock @ DataDog/apm-php @ DataDog/profiling-php @ Datadog/libdatadog-apm
1919package.xml @ DataDog/apm-php @ DataDog/profiling-php @ Datadog/asm-php
20- VERSION @ DataDog/apm-php @ DataDog/profiling-php @ Datadog/asm-php
20+ VERSION.txt @ DataDog/apm-php @ DataDog/profiling-php @ Datadog/asm-php
Original file line number Diff line number Diff line change 1414if [[ " $CI_COMMIT_BRANCH " =~ " ddtrace-" ]] ; then
1515 echo " Release branch detected; not adding git sha1 to version number."
1616else
17- version=$( cat VERSION)
17+ version=$( cat VERSION.txt )
1818 # if we have e.g. a beta suffix, just strip it
1919 if [[ $version == * -* ]]; then
2020 version=${version% -* }
2626 version=$( export IFS=.; (echo " ${parts[*]} " ))
2727 fi
2828 version=" $version +$githash "
29- echo -n " $version " > VERSION
29+ echo -n " $version " > VERSION.txt
3030 echo " Set version number to $version ."
3131fi
Original file line number Diff line number Diff line change @@ -35,7 +35,7 @@ ASSUME_COMPILED := ${DD_TRACE_ASSUME_COMPILED}
3535MAX_TEST_PARALLELISM ?= $(shell nproc)
3636ALL_TEST_ENV_OVERRIDE := $(shell [ -n "${DD_TRACE_DOCKER_DEBUG}" ] && echo DD_TRACE_IGNORE_AGENT_SAMPLING_RATES=1) DD_TRACE_GIT_METADATA_ENABLED=0 DD_CRASHTRACKER_RECEIVER_TIMEOUT_MS=15000
3737
38- VERSION := $(shell cat VERSION)
38+ VERSION := $(shell cat VERSION.txt )
3939
4040INI_DIR := $(shell ASAN_OPTIONS=detect_leaks=0 php -d ddtrace.disable=1 -i | awk -F"=>" '/Scan this dir for additional .ini files/ {print $$2}')
4141INI_FILE := $(INI_DIR ) /ddtrace.ini
@@ -106,7 +106,7 @@ JUNIT_RESULTS_DIR := $(shell pwd)
106106
107107all : $(BUILD_DIR ) /configure $(SO_FILE )
108108
109- $(BUILD_DIR ) /configure : $(M4_FILES ) $(BUILD_DIR ) /ddtrace.sym $(BUILD_DIR ) /VERSION
109+ $(BUILD_DIR ) /configure : $(M4_FILES ) $(BUILD_DIR ) /ddtrace.sym $(BUILD_DIR ) /VERSION.txt
110110 $(Q ) (cd $( BUILD_DIR) ; phpize && $( SED_I) ' s/\/FAILED/\/\\bFAILED/' $( BUILD_DIR) /run-tests.php) # Fix PHP 5.4 exit code bug when running selected tests (FAILED vs XFAILED)
111111
112112$(BUILD_DIR ) /run-tests.php : $(if $(ASSUME_COMPILED ) ,, $(BUILD_DIR ) /configure)
File renamed without changes.
Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ endforeach()
1010
1111list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR} /../cmake/Modules" )
1212
13- file (READ "../VERSION" appsec_version)
13+ file (READ "../VERSION.txt " appsec_version)
1414string (STRIP "${appsec_version} " appsec_version)
1515set (CMAKE_APPSEC_VERSION ${appsec_version} )
1616string (REGEX MATCH "^[^+a-z]*" appsec_short_version "${appsec_version} " )
Original file line number Diff line number Diff line change @@ -35,7 +35,7 @@ add_custom_target(ddtrace_exports
3535)
3636endif ()
3737
38- file (READ "${CMAKE_SOURCE_DIR} /../VERSION" VERSION_CONTENTS)
38+ file (READ "${CMAKE_SOURCE_DIR} /../VERSION.txt " VERSION_CONTENTS)
3939string (STRIP "${VERSION_CONTENTS} " PHP_DDTRACE_VERSION)
4040file (MAKE_DIRECTORY "${CMAKE_BINARY_DIR} /gen_ddtrace/ext" )
4141set (VERSION_H_PATH "${CMAKE_BINARY_DIR} /gen_ddtrace/ext/version.h" )
@@ -46,7 +46,7 @@ add_custom_command(
4646 COMMAND ${CMAKE_COMMAND} -E remove -f "${VERSION_H_PATH} "
4747 COMMAND ${CMAKE_COMMAND} -E touch "${VERSION_H_PATH} "
4848 COMMAND printf "\\ #ifndef PHP_DDTRACE_VERSION\\\\ n\\ #define PHP_DDTRACE_VERSION \" %s\"\\\\ n\\ #endif" "'\" ${PHP_DDTRACE_VERSION} \" '" >> "${VERSION_H_PATH} "
49- DEPENDS "${CMAKE_SOURCE_DIR} /../VERSION"
49+ DEPENDS "${CMAKE_SOURCE_DIR} /../VERSION.txt "
5050 COMMENT "Generating version.h"
5151)
5252add_custom_target (update_version_h ALL DEPENDS "${VERSION_H_PATH} " )
Original file line number Diff line number Diff line change @@ -23,12 +23,12 @@ fn main() {
2323 }
2424
2525 // Read the version from the VERSION file
26- let version = fs:: read_to_string ( "../VERSION" )
26+ let version = fs:: read_to_string ( "../VERSION.txt " )
2727 . expect ( "Failed to read VERSION file" )
2828 . trim ( )
2929 . to_string ( ) ;
3030 println ! ( "cargo:rustc-env=PROFILER_VERSION={version}" ) ;
31- println ! ( "cargo:rerun-if-changed=../VERSION" ) ;
31+ println ! ( "cargo:rerun-if-changed=../VERSION.txt " ) ;
3232
3333 let php_config_includes = std:: str:: from_utf8 ( php_config_includes_output. stdout . as_slice ( ) )
3434 . expect ( "`php-config`'s stdout to be valid utf8" ) ;
You can’t perform that action at this time.
0 commit comments