Skip to content

Add .go-version file for Jenkins#40

Merged
simitt merged 1 commit intoelastic:masterfrom
ruflin:go-version-file
Aug 15, 2017
Merged

Add .go-version file for Jenkins#40
simitt merged 1 commit intoelastic:masterfrom
ruflin:go-version-file

Conversation

@ruflin
Copy link
Copy Markdown
Contributor

@ruflin ruflin commented Aug 14, 2017

Jenkins depends on the .go-version file to decide with which Golang version the build should run. So far it was falling back to 1.8.3. With this change the apm-server repo depends on same go version as libbeat. This makes sure always the same Golang version for testing is used. The jenkins files were updated to use the new golang version file

Currently Windows cert tests are skipped as they break the build.

@ruflin ruflin added the review label Aug 14, 2017
mkdir -p "$dest_dir"
./build/docs/build_docs.pl --doc "$index" -out "$dest_dir"
fi
done
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this removed here?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is not removed but moved to the beats script directory -> see below. Git did not detect it correctly.

@@ -0,0 +1 @@
1.8.3
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

was this auto-created when running update.sh ?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, this was added to the script to be copied.

s.config.SSLEnabled = &truthy
if useCert {
cert := path.Join(tmpCertPath, t.Name()+time.Now().String()+".crt")
cert := path.Join(tmpCertPath, t.Name()+".crt")
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I saw these changes already in another PR.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, I'm trying to see if that actually fixes the windows build. But it doesn't. Because the server tests are breaking the windows build. Thinking about skipping them for now ...

Jenkins depends on the .go-version file to decide with which Golang version the build should run. So far it was falling back to 1.8.3. With this change the apm-server repo depends on same go version as libbeat. This makes sure always the same Golang version for testing is used. The jenkins files were updated to use the new golang version file

Currently Windows cert tests are skipped as they break the build.
@ruflin
Copy link
Copy Markdown
Contributor Author

ruflin commented Aug 14, 2017

@simitt @jalvz Didn't find a quick solution for the windows cert tests, so I skipped them for now. Lets fit it in #42

cp $GIT_CLONE/libbeat/docs/version.asciidoc libbeat/docs/version.asciidoc

# Add go version file for CI
cp $GIT_CLONE/.go-version .go-version
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor question, is there a specific reason you put it into the _beats folder? Afais it is only used in the scripts folder..

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The reason I put it into the _beats for is because it comes from beats. _beats represents a subset to the beats directory so all files copied from there we should keep in here I suggest.

@simitt simitt merged commit 206e2b6 into elastic:master Aug 15, 2017
@ruflin ruflin deleted the go-version-file branch August 15, 2017 08:13
graphaelli added a commit to graphaelli/apm-server that referenced this pull request Nov 29, 2017
axw pushed a commit that referenced this pull request Aug 11, 2020
…eger span (#4061)

* Use service.version for Metadata.Service.Version when converting a Jaeger span

* Added #40 to changelog
simitt pushed a commit to simitt/apm-server that referenced this pull request Oct 14, 2020
…eger span (elastic#4061)

* Use service.version for Metadata.Service.Version when converting a Jaeger span

* Added elastic#40 to changelog
simitt pushed a commit to simitt/apm-server that referenced this pull request Oct 14, 2020
…eger span (elastic#4061)

* Use service.version for Metadata.Service.Version when converting a Jaeger span

* Added elastic#40 to changelog
simitt added a commit that referenced this pull request Oct 14, 2020
…eger span (#4061) (#4318)

* Use service.version for Metadata.Service.Version when converting a Jaeger span

* Added #40 to changelog

Co-authored-by: Tobias Stadler <ts.stadler@gmx.de>
simitt added a commit that referenced this pull request Oct 14, 2020
…eger span (#4061) (#4317)

* Use service.version for Metadata.Service.Version when converting a Jaeger span

* Added #40 to changelog

Co-authored-by: Tobias Stadler <ts.stadler@gmx.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants